wenjy
/
JRM-intelligent-iot-AttachToPath
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 监控单元信息增加数据保存周期字段

Browse Source
main
wenjy 2 years ago
parent 9816ae78fb
commit acb07d76e0
7 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/application-druid.yml
Unescape Escape View File

@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Haiwei123456
password: haiwei@123
# url: jdbc:mysql://47.122.6.3:6001/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false
# username: root
# password: jrmRoot

2
ruoyi-admin/src/main/resources/application.yml
Unescape Escape View File

@ -1,7 +1,7 @@
# 项目相关配置
ruoyi:
# 名称
name: WenJY
name: jrm-intelligent-iot
# 版本
version: 4.7.1
# 版权年份

7
ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/add.html
Unescape Escape View File

@ -49,6 +49,13 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保存周期：</label>
<div class="col-sm-8">
<input name="savePeriod" class="form-control" type="text">
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-3 control-label">当前状态：</label>
<div class="col-sm-8">

7
ruoyi-admin/src/main/resources/templates/base/monitorUnitInfo/edit.html
Unescape Escape View File

@ -51,6 +51,13 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保存周期：</label>
<div class="col-sm-8">
<input name="savePeriod" th:field="*{savePeriod}" class="form-control" type="text">
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-3 control-label">当前状态：</label>
<div class="col-sm-8">

4
ruoyi-admin/src/main/resources/templates/login.html
Unescape Escape View File

@ -37,8 +37,8 @@
<div class="loginForm">
<form id="signupForm" autocomplete="off">
<h1 class="no-margins" style="text-align:center;">用户登录</h1>
<input type="text" name="username" class="form-control uname" value="admin" placeholder="用户名" />
<input type="password" name="password" class="form-control pword" value="admin123" placeholder="密码" />
<input type="text" name="username" class="form-control uname" placeholder="用户名" />
<input type="password" name="password" class="form-control pword" placeholder="密码" />
<div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

10
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMonitorunitInfo.java
Unescape Escape View File

@ -60,6 +60,8 @@ public class BaseMonitorunitInfo extends TreeEntity
private Long roleId;
private Long savePeriod;
public void setObjId(Long objId)
{
this.objId = objId;
@ -139,6 +141,14 @@ public class BaseMonitorunitInfo extends TreeEntity
this.roleId = roleId;
}
public Long getSavePeriod() {
return savePeriod;
}
public void setSavePeriod(Long savePeriod) {
this.savePeriod = savePeriod;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

8
ruoyi-system/src/main/resources/mapper/system/BaseMonitorunitInfoMapper.xml
Unescape Escape View File

@ -20,6 +20,7 @@
<result property="roleId" column="role_id" />
<result property="monitorunitStatus" column="Monitorunit_Status" />
<result property="monitorunitImage" column="monitorunit_Image" />
<result property="savePeriod" column="Save_Period" />
</resultMap>
<resultMap type="BaseMonitorunitInfoDto" id="BaseMonitorunitInfoDtoResult">
@ -42,7 +43,7 @@
</resultMap>
<sql id="selectBaseMonitorunitInfoVo">
select ObjId, MonitorUnit_Id, MonitorUnit_Name, Parent_Id, MonitorUnit_Type, Substation_Id, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time,Monitorunit_Status,Monitorunit_Image from base_monitorunit_info
select ObjId, MonitorUnit_Id, MonitorUnit_Name, Parent_Id, MonitorUnit_Type, Substation_Id, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time,Monitorunit_Status,Monitorunit_Image,Save_Period from base_monitorunit_info
</sql>
<select id="selectBaseMonitorunitInfoList" parameterType="BaseMonitorunitInfo" resultMap="BaseMonitorunitInfoResult">
@ -101,7 +102,7 @@
</select>
<select id="selectBaseMonitorunitInfoByObjId" parameterType="Long" resultMap="BaseMonitorunitInfoResult">
select t.ObjId, t.MonitorUnit_Id, t.MonitorUnit_Name,t.monitorunit_status, t.Monitorunit_Image,t.Parent_Id, t.MonitorUnit_Type, t.Substation_Id, t.Enable_Flag, t.Create_By, t.Create_Time, t.Update_By, t.Update_Time, p.MonitorUnit_Name as parent_name
select t.ObjId, t.MonitorUnit_Id,t.Save_Period, t.MonitorUnit_Name,t.monitorunit_status, t.Monitorunit_Image,t.Parent_Id, t.MonitorUnit_Type, t.Substation_Id, t.Enable_Flag, t.Create_By, t.Create_Time, t.Update_By, t.Update_Time, p.MonitorUnit_Name as parent_name
from base_monitorunit_info t
left join base_monitorunit_info p on p.MonitorUnit_Id = t.Parent_Id
where t.ObjId = #{objId}
@ -122,6 +123,7 @@
<if test="createTime != null">Create_Time,</if>
<if test="updateBy != null">Update_By,</if>
<if test="updateTime != null">Update_Time,</if>
<if test="savePeriod != null">Save_Period,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="monitorunitId != null">#{monitorunitId},</if>
@ -136,6 +138,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="savePeriod != null">#{savePeriod},</if>
</trim>
</insert>
@ -154,6 +157,7 @@
<if test="createTime != null">Create_Time = #{createTime},</if>
<if test="updateBy != null">Update_By = #{updateBy},</if>
<if test="updateTime != null">Update_Time = #{updateTime},</if>
<if test="savePeriod != null">Save_Period = #{savePeriod},</if>
</trim>
where ObjId = #{objId}
</update>

Write Preview
Loading…
Cancel
Save