`添加协议id`

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

@@ -55,6 +55,8 @@ public class TblSensor extends BaseEntity {
      * 状态
      */
     private String status;
+
+    private Long protocalId;
     /**
      * 备注
      */

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

@@ -69,6 +69,9 @@ public class TblSensorBo extends BaseEntity {
 //    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
+
+    private Long protocalId;
+
     /**
      * 备注
      */

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

@@ -75,6 +75,8 @@ public class TblSensorVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private Long protocalId;
+
     /**
      * 备注
      */

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

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.data.domain.DataPointUnit;
+import com.ruoyi.data.domain.TblSensor;
 import com.ruoyi.data.mapper.DatapointUnitMapper;
+import com.ruoyi.data.mapper.TblSensorMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.data.domain.bo.TblDatapointBo;
@@ -35,6 +37,8 @@ public class TblDatapointServiceImpl implements ITblDatapointService {
 
     private final TblDatapointMapper baseMapper;
 
+    private final TblSensorMapper sensorMapper;
+
     private final ModbusUtils modbusUtils;
 
     private final DatapointUnitMapper datapointPointMapper;

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

@@ -15,9 +15,11 @@ import com.ruoyi.data.domain.TblSensor;
 import com.ruoyi.data.mapper.TblSensorMapper;
 import com.ruoyi.data.service.ITblSensorService;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 传感器列Service业务层处理
@@ -71,6 +73,9 @@ public class TblSensorServiceImpl implements ITblSensorService {
         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());
+        if(bo.getParams()!=null && bo.getParams().get("notypes")!=null){
+            lqw.notIn(TblSensor::getProtocalType, Arrays.stream(bo.getParams().get("notypes").toString().split(",")).map(i->Long.parseLong(i)).collect(Collectors.toList()));
+        }
         return lqw;
     }
 

ruoyi-system/src/main/resources/mapper/data/TblSensorMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceId" column="device_id"/>
         <result property="sensorType" column="sensor_type"/>
         <result property="protocalType" column="protocal_type"/>
+        <result property="protocalId" column="protocal_id"/>
         <result property="sensorDesc" column="sensor_desc"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>