root
/
agri
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

新增卷帘

master
lld 2026-02-08 20:50:03 +08:00
parent 020f351e66
commit a2b6a770a4
4 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java
View File

@ -50,6 +50,14 @@ public class SysAgriLimit extends BaseEntity
@Excel(name = "卷被关限位时间(秒)")
private String jbgLimit;
/** 卷被开限位时间(秒) */
@Excel(name = "卷帘开限位时间(秒)")
private String jlkLimit;
/** 卷被关限位时间(秒) */
@Excel(name = "卷帘关限位时间(秒)")
private String jlgLimit;
/** 卷膜1开限位时间(秒) */
@Excel(name = "卷膜1开限位时间(秒)")
private String jm1kLimit;
@ -88,6 +96,22 @@ public class SysAgriLimit extends BaseEntity
@Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deleteTime;
public String getJlkLimit() {
return jlkLimit;
}
public void setJlkLimit(String jlkLimit) {
this.jlkLimit = jlkLimit;
}
public String getJlgLimit() {
return jlgLimit;
}
public void setJlgLimit(String jlgLimit) {
this.jlgLimit = jlgLimit;
}
public void setId(String id)
{
this.id = id;
@ -233,6 +257,8 @@ public class SysAgriLimit extends BaseEntity
.append("imei", getImei())
.append("jbkLimit", getJbkLimit())
.append("jbgLimit", getJbgLimit())
.append("jlkLimit", getJlkLimit())
.append("jlgLimit", getJlgLimit())
.append("jm1kLimit", getJm1kLimit())
.append("jm1gLimit", getJm1gLimit())
.append("jm2kLimit", getJm2kLimit())

26
agri-system/src/main/java/com/agri/system/domain/SysDtuRemark.java
View File

@ -36,6 +36,14 @@ public class SysDtuRemark extends BaseEntity
@Excel(name = "卷被关")
private String jbg;
/** 卷被开 */
@Excel(name = "卷帘开")
private String jlk;
/** 卷被关 */
@Excel(name = "卷帘关")
private String jlg;
/** 卷膜1开 */
@Excel(name = "卷膜1开")
private String jm1k;
@ -300,11 +308,29 @@ public class SysDtuRemark extends BaseEntity
return extJson;
}
public String getJlk() {
return jlk;
}
public void setJlk(String jlk) {
this.jlk = jlk;
}
public String getJlg() {
return jlg;
}
public void setJlg(String jlg) {
this.jlg = jlg;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("imei", getImei())
.append("jlk", getJlk())
.append("jlg", getJlg())
.append("jbk", getJbk())
.append("jbg", getJbg())
.append("jm1k", getJm1k())

12
agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml
View File

@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="imei" column="imei" />
<result property="jbkLimit" column="jbk_limit" />
<result property="jbgLimit" column="jbg_limit" />
<result property="jlkLimit" column="jlk_limit" />
<result property="jlgLimit" column="jlg_limit" />
<result property="jm1kLimit" column="jm1k_limit" />
<result property="jm1gLimit" column="jm1g_limit" />
<result property="jm2kLimit" column="jm2k_limit" />
@ -28,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSysAgriLimitVo">
select id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_by, update_time, deleted, delete_time from sys_agri_limit
select id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jlk_limit, jlg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_by, update_time, deleted, delete_time from sys_agri_limit
</sql>
<select id="selectSysAgriLimitList" parameterType="SysAgriLimit" resultMap="SysAgriLimitResult">
@ -39,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''"> and imei = #{imei}</if>
<if test="jbkLimit != null and jbkLimit != ''"> and jbk_limit = #{jbkLimit}</if>
<if test="jbgLimit != null and jbgLimit != ''"> and jbg_limit = #{jbgLimit}</if>
<if test="jlkLimit != null and jlkLimit != ''"> and jlk_limit = #{jlkLimit}</if>
<if test="jlgLimit != null and jlgLimit != ''"> and jlg_limit = #{jlgLimit}</if>
<if test="jm1kLimit != null and jm1kLimit != ''"> and jm1k_limit = #{jm1kLimit}</if>
<if test="jm1gLimit != null and jm1gLimit != ''"> and jm1g_limit = #{jm1gLimit}</if>
<if test="jm2kLimit != null and jm2kLimit != ''"> and jm2k_limit = #{jm2kLimit}</if>
@ -64,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei,</if>
<if test="jbkLimit != null">jbk_limit,</if>
<if test="jbgLimit != null">jbg_limit,</if>
<if test="jlkLimit != null">jlk_limit,</if>
<if test="jlgLimit != null">jlg_limit,</if>
<if test="jm1kLimit != null">jm1k_limit,</if>
<if test="jm1gLimit != null">jm1g_limit,</if>
<if test="jm2kLimit != null">jm2k_limit,</if>
@ -85,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">#{imei},</if>
<if test="jbkLimit != null">#{jbkLimit},</if>
<if test="jbgLimit != null">#{jbgLimit},</if>
<if test="jlkLimit != null">#{jlkLimit},</if>
<if test="jlgLimit != null">#{jlgLimit},</if>
<if test="jm1kLimit != null">#{jm1kLimit},</if>
<if test="jm1gLimit != null">#{jm1gLimit},</if>
<if test="jm2kLimit != null">#{jm2kLimit},</if>
@ -110,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei = #{imei},</if>
<if test="jbkLimit != null">jbk_limit = #{jbkLimit},</if>
<if test="jbgLimit != null">jbg_limit = #{jbgLimit},</if>
<if test="jlkLimit != null">jlk_limit = #{jlkLimit},</if>
<if test="jlgLimit != null">jlg_limit = #{jlgLimit},</if>
<if test="jm1kLimit != null">jm1k_limit = #{jm1kLimit},</if>
<if test="jm1gLimit != null">jm1g_limit = #{jm1gLimit},</if>
<if test="jm2kLimit != null">jm2k_limit = #{jm2kLimit},</if>

10
agri-system/src/main/resources/mapper/system/SysDtuRemarkMapper.xml
View File

@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="imei" column="imei" />
<result property="jbk" column="jbk" />
<result property="jbg" column="jbg" />
<result property="jlk" column="jlk" />
<result property="jlg" column="jlg" />
<result property="jm1k" column="jm1k" />
<result property="jm1g" column="jm1g" />
<result property="jm2k" column="jm2k" />
@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSysDtuRemarkVo">
select id, imei, jbk, jbg, jm1k, jm1g, jm2k, jm2g, jm3k, jm3g, temp1, humi1, temp2, humi2, temp3, humi3, temp4, humi4, version, create_by, create_time, update_by, update_time, ext_json from sys_dtu_remark
select id, imei, jbk, jbg, jlk, jlg, jm1k, jm1g, jm2k, jm2g, jm3k, jm3g, temp1, humi1, temp2, humi2, temp3, humi3, temp4, humi4, version, create_by, create_time, update_by, update_time, ext_json from sys_dtu_remark
</sql>
<select id="selectSysDtuRemarkList" parameterType="SysDtuRemark" resultMap="SysDtuRemarkResult">
@ -53,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei,</if>
<if test="jbk != null">jbk,</if>
<if test="jbg != null">jbg,</if>
<if test="jlk != null">jlk,</if>
<if test="jlg != null">jlg,</if>
<if test="jm1k != null">jm1k,</if>
<if test="jm1g != null">jm1g,</if>
<if test="jm2k != null">jm2k,</if>
@ -78,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">#{imei},</if>
<if test="jbk != null">#{jbk},</if>
<if test="jbg != null">#{jbg},</if>
<if test="jlk != null">#{jlk},</if>
<if test="jlg != null">#{jlg},</if>
<if test="jm1k != null">#{jm1k},</if>
<if test="jm1g != null">#{jm1g},</if>
<if test="jm2k != null">#{jm2k},</if>
@ -107,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei = #{imei},</if>
<if test="jbk != null">jbk = #{jbk},</if>
<if test="jbg != null">jbg = #{jbg},</if>
<if test="jlk != null">jlk = #{jlk},</if>
<if test="jlg != null">jlg = #{jlg},</if>
<if test="jm1k != null">jm1k = #{jm1k},</if>
<if test="jm1g != null">jm1g = #{jm1g},</if>
<if test="jm2k != null">jm2k = #{jm2k},</if>