diff --git a/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java b/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java
index b06b14f..576ec04 100644
--- a/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java
+++ b/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java
@@ -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,7 +96,23 @@ public class SysAgriLimit extends BaseEntity
@Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deleteTime;
- public void setId(String id)
+ 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())
diff --git a/agri-system/src/main/java/com/agri/system/domain/SysDtuRemark.java b/agri-system/src/main/java/com/agri/system/domain/SysDtuRemark.java
index e4ab42b..f577aed 100644
--- a/agri-system/src/main/java/com/agri/system/domain/SysDtuRemark.java
+++ b/agri-system/src/main/java/com/agri/system/domain/SysDtuRemark.java
@@ -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())
diff --git a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml
index 2a6e645..d105919 100644
--- a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml
+++ b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml
@@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -28,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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