Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSensor.java

@@ -62,4 +62,10 @@ public class TblSensor extends BaseEntity {
 
     private String datapoints;
 
+    private Long equipmentTreeId;
+
+    private String equipmentName;
+
+    private Long configUuid;
+
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorBo.java

@@ -77,5 +77,9 @@ public class TblSensorBo extends BaseEntity {
 
     private String datapoints;
 
+    private Long equipmentTreeId;
 
+    private String equipmentName;
+
+    private Long configUuid;
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSensorVo.java

@@ -80,4 +80,10 @@ public class TblSensorVo implements Serializable {
      */
     @ExcelProperty(value = "测点表")
     private String datapoints;
+
+    private Long equipmentTreeId;
+
+    private String equipmentName;
+
+    private Long configUuid;
 }

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblSensorServiceImpl.java

@@ -68,6 +68,9 @@ public class TblSensorServiceImpl implements ITblSensorService {
         lqw.eq(bo.getProtocalType() != null, TblSensor::getProtocalType, bo.getProtocalType());
         lqw.eq(StringUtils.isNotBlank(bo.getSensorDesc()), TblSensor::getSensorDesc, bo.getSensorDesc());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblSensor::getStatus, bo.getStatus());
+        lqw.eq(bo.getEquipmentTreeId() != null, TblSensor::getEquipmentTreeId, bo.getEquipmentTreeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEquipmentName()), TblSensor::getEquipmentName, bo.getEquipmentName());
+        lqw.eq(bo.getConfigUuid() != null, TblSensor::getConfigUuid, bo.getConfigUuid());
         return lqw;
     }