修改mqtt推送前端实验室传感器数据名称2

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,13 +199,13 @@ 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.getDescribe());
-            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 到这里结束
         //发送事件
         //本来使用mqtt接收，因为mqtt 每个客户端接受到都会处理，

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

@@ -914,7 +914,7 @@ public class LabSubjectManagerService {
                             SensorFunctionStatus sensorFunctionStatus = new SensorFunctionStatus();
                             sensorFunctionStatus.setFunNum(c.getFunNum());
                             sensorFunctionStatus.setDescribe(a.getDescribe());
-                            sensorFunctionStatus.setFuncName(c.getDescribe());
+                            sensorFunctionStatus.setFuncName(a.getFuncName());
                             sensorFunctionStatus.setOrder(c.getOrder());
                             sensorFunctionStatus.setHardwareNum(a.getHardwareNum());
                             sensorFunctionStatus.setUnit(c.getUnit());