wenhongquan 2 年之前
父節點
當前提交
97b5679b28

+ 1 - 2
ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusRtu.java

@@ -74,8 +74,7 @@ public class TblModbusRtu extends BaseEntity {
     /**
      *
      */
-    @TableField("intervals")
-    private String interval;
+    private String intervals;
     /**
      *
      */

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusRtuBo.java

@@ -99,7 +99,7 @@ public class TblModbusRtuBo extends BaseEntity {
      *
      */
 //    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String interval;
+    private String intervals;
 
 //    /**
 //     *

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblModbusRtuServiceImpl.java

@@ -72,7 +72,7 @@ public class TblModbusRtuServiceImpl implements ITblModbusRtuService {
         lqw.eq(bo.getParity() != null, TblModbusRtu::getParity, bo.getParity());
         lqw.eq(bo.getStopBits() != null, TblModbusRtu::getStopBits, bo.getStopBits());
         lqw.eq(StringUtils.isNotBlank(bo.getUuid()), TblModbusRtu::getUuid, bo.getUuid());
-        lqw.eq(StringUtils.isNotBlank(bo.getInterval()), TblModbusRtu::getInterval, bo.getInterval());
+        lqw.eq(StringUtils.isNotBlank(bo.getIntervals()), TblModbusRtu::getIntervals, bo.getIntervals());
         return lqw;
     }
 

+ 1 - 1
ruoyi-system/src/main/resources/mapper/data/TblModbusRtuMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parity" column="parity"/>
         <result property="stopBits" column="stop_bits"/>
         <result property="uuid" column="uuid"/>
-        <result property="interval" column="intervals"/>
+        <result property="intervals" column="intervals"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>