修复实验室配置添加传感器网关+路由去重处理

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSensorController.java

@@ -111,8 +111,8 @@ public class LabSensorController extends BaseController {
             LabSensor sensor = new LabSensor();
             sensor.setGatewayId(labSensor.getGatewayId());
             sensor.setRouteNum(num);
-            List<LabSensorVO> list = labSensorService.selectLabSensorList(sensor);
-            if (list != null && list.size() > 0) {
+            Integer count = labSensorService.selectDataCount(sensor);
+            if (count != null && count > 0) {
                 return ResultData.fail("此网关编号+路由信息已存在，不可重复添加");
             }
             return ResultData.success(labSensorService.insertLabSensor(labSensor));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabSensorMapper.java

@@ -94,4 +94,11 @@ public interface LabSensorMapper {
     List<LabSensor> getSensorListBySubId(@Param("id") Long id);
 
     List<Integer> getSensorTypesBySubId(@Param("id") Long id);
+
+    /**
+     * 统计数量
+     * @param labSensor
+     * @return
+     */
+    Integer selectDataCount(LabSensor labSensor);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSensorService.java

@@ -99,4 +99,11 @@ public interface ILabSensorService {
      * @return
      */
     List<Integer> getSensorTypesBySubId(Long id);
+
+    /**
+     * 统计数据
+     * @param labSensor
+     * @return
+     */
+    Integer selectDataCount(LabSensor labSensor);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSensorServiceImpl.java

@@ -288,4 +288,9 @@ public class LabSensorServiceImpl implements ILabSensorService {
     public List<Integer> getSensorTypesBySubId(Long id) {
         return labSensorMapper.getSensorTypesBySubId(id);
     }
+
+    @Override
+    public Integer selectDataCount(LabSensor labSensor) {
+        return labSensorMapper.selectDataCount(labSensor);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -1403,5 +1403,4 @@ public class LabSubjectManagerService {
     public List<TotalByID> queryBuildingSubTotal(Long... ids) {
         return subjectService.queryCountByBuildIds(ids);
     }
-
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSensorMapper.xml

@@ -93,7 +93,6 @@
             </if>
             <if test="deptName != null  and deptName != ''">and xx.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null ">and xx.user_id = #{userId}</if>
-            <if test="routeNum != null ">AND xx.route_num = #{routeNum}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
@@ -310,4 +309,21 @@
         from lab_sensor
         where subject_id = #{id}
     </select>
+    
+    <select id="selectDataCount" parameterType="com.zd.laboratory.domain.LabSensor" resultType="java.lang.Integer">
+        select count(*)
+        from lab_sensor
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="type != null ">and type = #{type}</if>
+            <if test="gatewayId != null and gatewayId!='' ">and gateway_id = #{gatewayId}</if>
+            <if test="senseState != null ">and sense_state = #{senseState}</if>
+            <if test="senseData != null ">and sense_data = #{senseData}</if>
+            <if test="dataUpper != null ">and data_upper = #{dataUpper}</if>
+            <if test="dataLower != null ">and data_lower = #{dataLower}</if>
+            <if test="macAdd != null  and macAdd != ''">and mac_add = #{macAdd}</if>
+            <if test="subjectId != null ">and subject_id = #{subjectId}</if>
+            <if test="routeNum != null ">AND route_num = #{routeNum}</if>
+        </where>
+    </select>
 </mapper>