Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

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

@@ -7,7 +7,6 @@ import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.Assert;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SubFunction;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.event.LabMessageEvent;
@@ -23,13 +22,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import java.util.*;
-
 /**
  * 实验室消息发送管理 -- 对外使用该类进行操作
  *
@@ -201,17 +199,14 @@ public class SubMessageSendManager {
             return;
         }
         //todo 这里是零时处理一下甲烷传感器没有上报describe 数据，这里先用funName代替describe，后期修复好了，在删除这块代码
-        List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
-        List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
-        for(SensorFunctionStatus sensor:functionStatuses){
-            sensor.setDescribe(sensor.getFuncName());
-            newFunctionStatuses.add(sensor);
-        }
-        subFunction.setFunctionStatuses(newFunctionStatuses);
+//        List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
+//        List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
+//        for(SensorFunctionStatus sensor:functionStatuses){
+//            sensor.setDescribe(sensor.getDescribe());
+//            newFunctionStatuses.add(sensor);
+//        }
+//        subFunction.setFunctionStatuses(newFunctionStatuses);
         //todo 到这里结束
-
-        //String json = JSONObject.toJSONString(subFunction);
-        //logger.error("@@@@@@@@" + json);
         //发送事件
         //本来使用mqtt接收，因为mqtt 每个客户端接受到都会处理，
         List<LabMessageEvent> labMessageEvents = mqttConfig.getLabMessMap().get(MqttConstants.TOPIC_LAB_FUNCTION_DATA);

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

@@ -163,12 +163,13 @@
         FROM lab_risk_plan_abnormal_group g
         LEFT JOIN lab_subject s ON s.id = g.subject_id
         <where>
+            g.STATUS = 0
             <if test="searchValue != null and searchValue!='' ">and (
                 g.group_name like concat('%', #{searchValue}, '%')
                 or s.name like concat('%', #{searchValue}, '%')
                 )
             </if>
-            <if test="riskAttribute != null ">and risk_attribute = #{riskAttribute}</if>
+            <if test="riskAttribute != null ">and g.risk_attribute = #{riskAttribute}</if>
         </where>
         ORDER  BY g.create_time DESC
     </select>