一键灭火逻辑修改

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/controller/FireDeviceController.java

@@ -14,6 +14,7 @@ import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.api.entity.OneClickFireDTO;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.CacheConstants;
 import com.zd.model.constant.CacheDevice;
@@ -431,6 +432,13 @@ public class FireDeviceController extends BaseController {
             map = sendOutFireMsg(hdlist,map,list.get(0).getDeviceCode());
         }
 
+        //通知预案（手动灭火）
+        OneClickFireDTO dto = new OneClickFireDTO();
+        dto.setDeviceCode(list.get(0).getDeviceCode());
+        dto.setIfFire(1);
+        dto.setAutomanual(0);
+        remoteLaboratoryService.oneClickFire(dto);
+
         //灭火日志添加
         HardwareFireDeviceLog fireDeviceLog = new HardwareFireDeviceLog();
         fireDeviceLog.setFireDeviceId(list.get(0).getId());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -287,7 +287,8 @@ public class MqttConfig {
                             //commonSend.send(MqttConstants.TOPIC_FIRE_DEVICE_CATCHFIRE+receivedTopic,jsonObject.toJSONString());
                             OneClickFireDTO dto = new OneClickFireDTO();
                             dto.setDeviceCode(receivedTopic);
-                            dto.setIfFire(fireNumber);
+                            dto.setIfFire(1);
+                            dto.setAutomanual(1);
                             remoteLaboratoryService.oneClickFire(dto);
 
                             String isExist = redisService.getCacheObject(CacheConstants.FIRE_LOG_IS_EXIST);