diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 2f62c1b..625dea2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -1593,7 +1593,7 @@ StatusEnum.ALARM_ON, monitorBaseInfo.getLineNum()); alarmRecordService.save(alarmRecord); //更新设备状态为报警 -// monipoiInfoService.updateStatus(dataGas) + monipoiInfoService.updateStatus(monitorBaseInfo.getMonitorId(), StatusEnum.STATUS_ALARM); //推送前端 JSONObject msg = new JSONObject(); msg.put("type", "gasAlarm"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 2f62c1b..625dea2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -1593,7 +1593,7 @@ StatusEnum.ALARM_ON, monitorBaseInfo.getLineNum()); alarmRecordService.save(alarmRecord); //更新设备状态为报警 -// monipoiInfoService.updateStatus(dataGas) + monipoiInfoService.updateStatus(monitorBaseInfo.getMonitorId(), StatusEnum.STATUS_ALARM); //推送前端 JSONObject msg = new JSONObject(); msg.put("type", "gasAlarm"); diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 30a38fb..928f611 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -46,5 +46,7 @@ boolean updateStatus(String deviceIp,String status); + boolean updateStatus(Long monitorId,String status); + boolean updateDeviceStatus(String status); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 2f62c1b..625dea2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -1593,7 +1593,7 @@ StatusEnum.ALARM_ON, monitorBaseInfo.getLineNum()); alarmRecordService.save(alarmRecord); //更新设备状态为报警 -// monipoiInfoService.updateStatus(dataGas) + monipoiInfoService.updateStatus(monitorBaseInfo.getMonitorId(), StatusEnum.STATUS_ALARM); //推送前端 JSONObject msg = new JSONObject(); msg.put("type", "gasAlarm"); diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 30a38fb..928f611 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -46,5 +46,7 @@ boolean updateStatus(String deviceIp,String status); + boolean updateStatus(Long monitorId,String status); + boolean updateDeviceStatus(String status); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index a94ea14..ed4fe52 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -169,6 +169,15 @@ } @Override + public boolean updateStatus(Long monitorId, String status) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("VALID", "0"); + updateWrapper.eq("ID", monitorId); + updateWrapper.set("DEVICE_STATUS",status); + return this.update(updateWrapper); + } + + @Override public boolean updateDeviceStatus(String status) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("VALID", "0");