一键灭火逻辑修改

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

@@ -250,15 +250,15 @@ public class LabRiskPlanController extends BaseController {
     @Log(title = "一件灭火触发火焰预警")
     @PostMapping("/oneClickFire")
     public ResultData oneClickFire(@RequestBody OneClickFireDTO oneClickFireDTO){
-        logger.info("一件灭火触发火焰预警,入参={}", JSON.toJSONString(oneClickFireDTO));
         if (!Objects.isNull(oneClickFireDTO)) {
+            logger.info("一件灭火触发火焰预警,入参={}", JSON.toJSONString(oneClickFireDTO));
             if (oneClickFireDTO.getIfFire() == 1) {
                 R deviceByCode = remoteFireDeviceService.getDeviceByCode(oneClickFireDTO.getDeviceCode());
                 if (deviceByCode.getCode()!=(HttpStatus.SUCCESS)){
                     return ResultData.fail("查询一键灭火设备信息失败！");
                 }
-                HardwareFireDeviceVO hardwareFireDevice = (HardwareFireDeviceVO) deviceByCode.getData();
-                if (hardwareFireDevice.getSubjectId() != null){
+                HardwareFireDeviceVO hardwareFireDeviceVO = JSON.parseObject(JSON.toJSONString(deviceByCode.getData()), HardwareFireDeviceVO.class);
+                if (hardwareFireDeviceVO.getSubjectId() != null){
                     SubFunction subFunction = new SubFunction();
                     List<SensorFunctionStatus> sensorFunctionStatuses = new ArrayList<>();
                     SensorFunctionStatus sensorFunctionStatus = new SensorFunctionStatus();
@@ -267,7 +267,7 @@ public class LabRiskPlanController extends BaseController {
                     sensorFunctionStatus.setHardwareNum(oneClickFireDTO.getDeviceCode());
                     sensorFunctionStatus.setDescribe("火焰");
                     sensorFunctionStatuses.add(sensorFunctionStatus);
-                    subFunction.setSubId(hardwareFireDevice.getSubjectId());
+                    subFunction.setSubId(hardwareFireDeviceVO.getSubjectId());
                     subFunction.setFunctionStatuses(sensorFunctionStatuses);
                     triggerRiskPlan(subFunction);
                     return ResultData.success();