diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 284bb01..4fef87c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -29,6 +29,8 @@ Map>> watchDataByWell(DeviceMonitorRequestDTO requestDTO); + Map> latestValue(DeviceMonitorRequestDTO requestDTO); + List lifecycleRecord(DeviceMonitorRequestDTO requestDTO); List repairLog(DeviceMonitorRequestDTO requestDTO); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 284bb01..4fef87c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -29,6 +29,8 @@ Map>> watchDataByWell(DeviceMonitorRequestDTO requestDTO); + Map> latestValue(DeviceMonitorRequestDTO requestDTO); + List lifecycleRecord(DeviceMonitorRequestDTO requestDTO); List repairLog(DeviceMonitorRequestDTO requestDTO); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 13a8e74..4b0c2d6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -125,9 +125,9 @@ List gasDtoList = new ArrayList<>(); List> objectList = this.monitorData(requestDTO); objectList.forEach(object -> { - gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"), - CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"), - CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime"))); + gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object, "devcode"), CommonUtil.getString(object, "strength"), + CommonUtil.getString(object, "cell"), CommonUtil.getString(object, "pci"), + CommonUtil.getString(object, "uptime"), CommonUtil.getString(object, "logtime"))); }); iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -135,9 +135,9 @@ List tubeDtoList = new ArrayList<>(); List> objectTubeList = this.monitorData(requestDTO); objectTubeList.forEach(object -> { - tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"), - CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"), - CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME"))); + tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "GASVAL"), + CommonUtil.getString(object, "VBAT"), CommonUtil.getString(object, "RSRP"), + CommonUtil.getString(object, "UPTIME"), CommonUtil.getString(object, "LOGTIME"))); }); iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -145,15 +145,15 @@ List dtoPipeOtherList = new ArrayList<>(); List> pipeOtherObjectList = this.monitorData(requestDTO); pipeOtherObjectList.forEach(object -> { - dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"), - CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"), - CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"), - "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"), - CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否", - CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS"))); + dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "LEFT_LENGTH"), + CommonUtil.getString(object, "RIGHT_LENGTH"), CommonUtil.getString(object, "TEMPERATURE"), + CommonUtil.getString(object, "HUMIDITY"), CommonUtil.getString(object, "VBAT"), + "1".equals(CommonUtil.getString(object, "PIPE_INCLINE_ALARM")) ? "是" : "否", CommonUtil.getString(object, "UPTIME"), + CommonUtil.getString(object, "LOGTIME"), "1".equals(CommonUtil.getString(object, "PIPE_BREAK_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "GAS_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "LEFT_OFF_LINE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "LEFT_VIBRATE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "RIGHT_VIBRATE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "RIGHT_OFF_LINE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "PICTURE_ALARM")) ? "是" : "否", + CommonUtil.getString(object, "LEFT_GAS"), CommonUtil.getString(object, "RIGHT_GAS"))); }); iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -286,6 +286,7 @@ List list = new ArrayList<>(); if (!CollectionUtil.isEmpty(results)) { List baseDeviceTypes = deviceTypeService.list(); + List busLedgerDTOList = iBusLedgerService.getBusLedgers(); final Integer[] index = {0}; results.forEach(deviceImportDTO -> { index[0]++; @@ -304,7 +305,16 @@ }); //若安装位号不为空，检查是否存在 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) { - List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); +// List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); + List ledgerIds = new ArrayList<>(); + + busLedgerDTOList.forEach(busLedgerDTO -> { + if (deviceImportDTO.getTagNumber().equals(busLedgerDTO.getTagNumber()) && + deviceImportDTO.getWatchObject().equals(busLedgerDTO.getType()) && + deviceImportDTO.getDeptid().equals(busLedgerDTO.getDeptid())) { + ledgerIds.add(busLedgerDTO.getId()); + } + }); if (null == ledgerIds || ledgerIds.size() < 1) { list.add("第" + index[0] + "行，安装位号不存在！"); return; @@ -318,19 +328,25 @@ } List busDeviceList = BusDevice.convertDeviceList(results); - //保存设备信息 - this.saveBatch(busDeviceList); - List busDeviceLedgers = new ArrayList<>(); + try { + //保存设备信息 + this.saveBatch(busDeviceList); - busDeviceList.forEach(device -> { - for (Long ledgerId : device.getLedgerIds()) { - busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + List busDeviceLedgers = new ArrayList<>(); + + busDeviceList.forEach(device -> { + for (Long ledgerId : device.getLedgerIds()) { + busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + } + }); + if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { + this.busDeviceLedgerService.saveBatch(busDeviceLedgers); } - }); - if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { - this.busDeviceLedgerService.saveBatch(busDeviceLedgers); + }catch (Exception e){ + e.printStackTrace(); } + } else { list.add("导入数据不能为空"); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 284bb01..4fef87c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -29,6 +29,8 @@ Map>> watchDataByWell(DeviceMonitorRequestDTO requestDTO); + Map> latestValue(DeviceMonitorRequestDTO requestDTO); + List lifecycleRecord(DeviceMonitorRequestDTO requestDTO); List repairLog(DeviceMonitorRequestDTO requestDTO); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 13a8e74..4b0c2d6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -125,9 +125,9 @@ List gasDtoList = new ArrayList<>(); List> objectList = this.monitorData(requestDTO); objectList.forEach(object -> { - gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"), - CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"), - CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime"))); + gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object, "devcode"), CommonUtil.getString(object, "strength"), + CommonUtil.getString(object, "cell"), CommonUtil.getString(object, "pci"), + CommonUtil.getString(object, "uptime"), CommonUtil.getString(object, "logtime"))); }); iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -135,9 +135,9 @@ List tubeDtoList = new ArrayList<>(); List> objectTubeList = this.monitorData(requestDTO); objectTubeList.forEach(object -> { - tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"), - CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"), - CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME"))); + tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "GASVAL"), + CommonUtil.getString(object, "VBAT"), CommonUtil.getString(object, "RSRP"), + CommonUtil.getString(object, "UPTIME"), CommonUtil.getString(object, "LOGTIME"))); }); iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -145,15 +145,15 @@ List dtoPipeOtherList = new ArrayList<>(); List> pipeOtherObjectList = this.monitorData(requestDTO); pipeOtherObjectList.forEach(object -> { - dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"), - CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"), - CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"), - "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"), - CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否", - CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS"))); + dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "LEFT_LENGTH"), + CommonUtil.getString(object, "RIGHT_LENGTH"), CommonUtil.getString(object, "TEMPERATURE"), + CommonUtil.getString(object, "HUMIDITY"), CommonUtil.getString(object, "VBAT"), + "1".equals(CommonUtil.getString(object, "PIPE_INCLINE_ALARM")) ? "是" : "否", CommonUtil.getString(object, "UPTIME"), + CommonUtil.getString(object, "LOGTIME"), "1".equals(CommonUtil.getString(object, "PIPE_BREAK_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "GAS_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "LEFT_OFF_LINE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "LEFT_VIBRATE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "RIGHT_VIBRATE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "RIGHT_OFF_LINE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "PICTURE_ALARM")) ? "是" : "否", + CommonUtil.getString(object, "LEFT_GAS"), CommonUtil.getString(object, "RIGHT_GAS"))); }); iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -286,6 +286,7 @@ List list = new ArrayList<>(); if (!CollectionUtil.isEmpty(results)) { List baseDeviceTypes = deviceTypeService.list(); + List busLedgerDTOList = iBusLedgerService.getBusLedgers(); final Integer[] index = {0}; results.forEach(deviceImportDTO -> { index[0]++; @@ -304,7 +305,16 @@ }); //若安装位号不为空，检查是否存在 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) { - List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); +// List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); + List ledgerIds = new ArrayList<>(); + + busLedgerDTOList.forEach(busLedgerDTO -> { + if (deviceImportDTO.getTagNumber().equals(busLedgerDTO.getTagNumber()) && + deviceImportDTO.getWatchObject().equals(busLedgerDTO.getType()) && + deviceImportDTO.getDeptid().equals(busLedgerDTO.getDeptid())) { + ledgerIds.add(busLedgerDTO.getId()); + } + }); if (null == ledgerIds || ledgerIds.size() < 1) { list.add("第" + index[0] + "行，安装位号不存在！"); return; @@ -318,19 +328,25 @@ } List busDeviceList = BusDevice.convertDeviceList(results); - //保存设备信息 - this.saveBatch(busDeviceList); - List busDeviceLedgers = new ArrayList<>(); + try { + //保存设备信息 + this.saveBatch(busDeviceList); - busDeviceList.forEach(device -> { - for (Long ledgerId : device.getLedgerIds()) { - busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + List busDeviceLedgers = new ArrayList<>(); + + busDeviceList.forEach(device -> { + for (Long ledgerId : device.getLedgerIds()) { + busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + } + }); + if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { + this.busDeviceLedgerService.saveBatch(busDeviceLedgers); } - }); - if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { - this.busDeviceLedgerService.saveBatch(busDeviceLedgers); + }catch (Exception e){ + e.printStackTrace(); } + } else { list.add("导入数据不能为空"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 7feeb89..c856fa8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -73,7 +73,10 @@ } - + @Override + public List getBusLedgers() { + return this.baseMapper.getBusLedgers(); + } @Override public BusLedger detail(Long id) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 284bb01..4fef87c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -29,6 +29,8 @@ Map>> watchDataByWell(DeviceMonitorRequestDTO requestDTO); + Map> latestValue(DeviceMonitorRequestDTO requestDTO); + List lifecycleRecord(DeviceMonitorRequestDTO requestDTO); List repairLog(DeviceMonitorRequestDTO requestDTO); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 13a8e74..4b0c2d6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -125,9 +125,9 @@ List gasDtoList = new ArrayList<>(); List> objectList = this.monitorData(requestDTO); objectList.forEach(object -> { - gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"), - CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"), - CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime"))); + gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object, "devcode"), CommonUtil.getString(object, "strength"), + CommonUtil.getString(object, "cell"), CommonUtil.getString(object, "pci"), + CommonUtil.getString(object, "uptime"), CommonUtil.getString(object, "logtime"))); }); iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -135,9 +135,9 @@ List tubeDtoList = new ArrayList<>(); List> objectTubeList = this.monitorData(requestDTO); objectTubeList.forEach(object -> { - tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"), - CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"), - CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME"))); + tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "GASVAL"), + CommonUtil.getString(object, "VBAT"), CommonUtil.getString(object, "RSRP"), + CommonUtil.getString(object, "UPTIME"), CommonUtil.getString(object, "LOGTIME"))); }); iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -145,15 +145,15 @@ List dtoPipeOtherList = new ArrayList<>(); List> pipeOtherObjectList = this.monitorData(requestDTO); pipeOtherObjectList.forEach(object -> { - dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"), - CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"), - CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"), - "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"), - CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否", - CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS"))); + dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "LEFT_LENGTH"), + CommonUtil.getString(object, "RIGHT_LENGTH"), CommonUtil.getString(object, "TEMPERATURE"), + CommonUtil.getString(object, "HUMIDITY"), CommonUtil.getString(object, "VBAT"), + "1".equals(CommonUtil.getString(object, "PIPE_INCLINE_ALARM")) ? "是" : "否", CommonUtil.getString(object, "UPTIME"), + CommonUtil.getString(object, "LOGTIME"), "1".equals(CommonUtil.getString(object, "PIPE_BREAK_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "GAS_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "LEFT_OFF_LINE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "LEFT_VIBRATE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "RIGHT_VIBRATE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "RIGHT_OFF_LINE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "PICTURE_ALARM")) ? "是" : "否", + CommonUtil.getString(object, "LEFT_GAS"), CommonUtil.getString(object, "RIGHT_GAS"))); }); iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -286,6 +286,7 @@ List list = new ArrayList<>(); if (!CollectionUtil.isEmpty(results)) { List baseDeviceTypes = deviceTypeService.list(); + List busLedgerDTOList = iBusLedgerService.getBusLedgers(); final Integer[] index = {0}; results.forEach(deviceImportDTO -> { index[0]++; @@ -304,7 +305,16 @@ }); //若安装位号不为空，检查是否存在 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) { - List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); +// List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); + List ledgerIds = new ArrayList<>(); + + busLedgerDTOList.forEach(busLedgerDTO -> { + if (deviceImportDTO.getTagNumber().equals(busLedgerDTO.getTagNumber()) && + deviceImportDTO.getWatchObject().equals(busLedgerDTO.getType()) && + deviceImportDTO.getDeptid().equals(busLedgerDTO.getDeptid())) { + ledgerIds.add(busLedgerDTO.getId()); + } + }); if (null == ledgerIds || ledgerIds.size() < 1) { list.add("第" + index[0] + "行，安装位号不存在！"); return; @@ -318,19 +328,25 @@ } List busDeviceList = BusDevice.convertDeviceList(results); - //保存设备信息 - this.saveBatch(busDeviceList); - List busDeviceLedgers = new ArrayList<>(); + try { + //保存设备信息 + this.saveBatch(busDeviceList); - busDeviceList.forEach(device -> { - for (Long ledgerId : device.getLedgerIds()) { - busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + List busDeviceLedgers = new ArrayList<>(); + + busDeviceList.forEach(device -> { + for (Long ledgerId : device.getLedgerIds()) { + busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + } + }); + if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { + this.busDeviceLedgerService.saveBatch(busDeviceLedgers); } - }); - if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { - this.busDeviceLedgerService.saveBatch(busDeviceLedgers); + }catch (Exception e){ + e.printStackTrace(); } + } else { list.add("导入数据不能为空"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 7feeb89..c856fa8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -73,7 +73,10 @@ } - + @Override + public List getBusLedgers() { + return this.baseMapper.getBusLedgers(); + } @Override public BusLedger detail(Long id) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 604cac0..2c1dda5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,6 +60,21 @@ return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } + + @Override + public Map> latestValue(DeviceMonitorRequestDTO request) { + Map> resultMap = new HashMap<>(); + List deviceMonitorDTOList = this.baseMapper.getDeviceList(request.getWellId()); + for (DeviceMonitorDTO deviceMonitorDTO : deviceMonitorDTOList) { + Map map = new HashMap<>(); + map.put("value",deviceMonitorDTO.getLatestValue()); + map.put("state",deviceMonitorDTO.getState()); + map.put("devcode",deviceMonitorDTO.getDevcode()); + resultMap.put(deviceMonitorDTO.getDevTypeName(), map); + } + return resultMap; + } + @Override public Map>> watchDataByWell(DeviceMonitorRequestDTO request) { Map>> resultMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 762477e..af1f4f3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -13,7 +13,9 @@ import com.casic.missiles.dto.StateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.modular.alarm.dto.AlarmRuleDeviceDTO; import com.casic.missiles.modular.alarm.dto.AlarmRuleRequestDTO; +import com.casic.missiles.modular.alarm.dto.AlarmRuleResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRule; import com.casic.missiles.modular.alarm.service.IAlarmEventProductService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; @@ -53,7 +55,7 @@ public ReturnDTO listPage(@RequestBody AlarmRuleRequestDTO requestDTO) { Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page,requestDTO))); + return ReturnUtil.success(super.packForBT(iAlarmRuleService.pageList(page, requestDTO))); } @ApiOperation("新增") @@ -110,5 +112,16 @@ }); return ReturnUtil.success(eventProductService.alarmEventList(idDTO.getId())); } + + + @ApiOperation("根据设备编号获取报警阈值") + @PostMapping("/getAlarmThresholdByCode") + @ResponseBody + public ReturnDTO getAlarmThresholdByCode(@RequestBody AlarmRuleDeviceDTO alarmRuleDeviceDTO) { + Assert.isFalse(Objects.isNull(alarmRuleDeviceDTO.getDevCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRuleService.getByDevCode(alarmRuleDeviceDTO.getDevCode())); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java index b4aa7ba..a533a99 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java @@ -44,7 +44,7 @@ DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id); - void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell); + void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value); Page pop(Page page, @Param("deptIdStr") String deptIdStr); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml index e972c17..65ec5f0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml @@ -720,6 +720,7 @@ update bus_device set CELL = #{cell}, ONLINE_STATE = #{onLineStatus}, + MONITOR_VALUE = #{value}, LOGTIME = now() where DEVCODE = #{devCode} and valid >0 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index 043ee52..c815152 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -72,7 +72,7 @@ void processOffline(); - void updateCell(String devCode, String onLineStatus, String cell); + void updateCell(String devCode, String onLineStatus, String cell, String value); boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 57b155f..543f34e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -680,8 +680,8 @@ * @param cell */ @Override - public void updateCell(String devCode, String onLineStatus, String cell) { - this.baseMapper.updateCell(devCode, onLineStatus, cell); + public void updateCell(String devCode, String onLineStatus, String cell,String value) { + this.baseMapper.updateCell(devCode, onLineStatus, cell,value); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java index 4b919dd..2430ae3 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -22,9 +22,6 @@ @PostMapping("/addDevice") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 return ResponseData.success(iAlarmRecordsService.processAppContent(resultParams)); } - - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index 6bbad1c..33bbd4d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -173,7 +173,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java index bb05167..71f7566 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java @@ -209,7 +209,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,CH4L+","+CH4R); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java index e6cf801..1845207 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java @@ -179,7 +179,7 @@ alarmRecordsService.cancelDataAlarm(devCode); } //6.更新电量及状态 (1:正常，2：报警) - alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell); + alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell,gas); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 265d030..653372f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -92,5 +92,15 @@ return ReturnUtil.success(wellMonitorService.repairLog(requestDTO)); } + @ApiOperation("闸井最新监测值显示") + @PostMapping("/latestValue") + @ResponseBody + public ReturnDTO latestValue(@RequestBody DeviceMonitorRequestDTO requestDTO) { + Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(wellMonitorService.latestValue(requestDTO)); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index da0910d..bda712b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -36,4 +36,7 @@ @Select("SELECT b.ORG_ID,b.ORG_CODE,b.ORG_NAME,b.PARENT_ID FROM `bus_sync_org_relation` b WHERE b.DEL_FLAG =0 and b.PARENT_ID = #{syncId} ") List synDept(@Param("syncId") String syncId); + + @Select("SELECT id,tagNumber,deptid,type FROM bus_ledger_all_view ") + List getBusLedgers(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java index 0fe29b6..ff1783c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java @@ -29,10 +29,10 @@ List list(@Param("deptIds") String deptIds, @Param("request") BusLedgerDTO request); - @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " + + @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE FROM bus_device bd where " + " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) " + " SELECT device.devcode , " + - " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") + " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE") List getDeviceList(@Param("ledgerId") Long ledgerId); List> getWatchData(@Param("tableName") String tableName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java index 1f1123f..71b57ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java @@ -15,5 +15,11 @@ @ApiModelProperty("设备类型名称") private String devTypeName; + @ApiModelProperty("设备状态（1：在线，0：离线,2:报警）") + private String state; + + @ApiModelProperty("最新监测值") + private String latestValue; + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java index 2d6ed77..dfd8f20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** *

- * 设备管理 + * 设备管理 *

* * @author zt @@ -106,7 +107,7 @@ private String remarks; @ExcelProperty(value = "监测对象", order = 3) - @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）",required = true) + @ApiModelProperty(value = "监测对象（1：闸井、2：场站、3：管线）", required = true) @TableField("WATCH_OBJECT") private String watchObject; @@ -175,9 +176,21 @@ this.ledgerIds = ledgerIds; } - public static List convertDeviceList(List dtoList){ - List busDeviceList = new ArrayList<>(); + public static List convertDeviceList(List dtoList) { + + + List deviceImportDTOList = new ArrayList<>(); dtoList.forEach(deviceImportDTO -> { + List devCodes = deviceImportDTOList.stream().map(BusDeviceImportDTO::getDevCode).collect(Collectors.toList()); + if (devCodes.contains(deviceImportDTO.getDevCode())) { + BusDeviceImportDTO dto1 = deviceImportDTOList.stream().filter(dto -> dto.getDevCode().equals(deviceImportDTO.getDevCode())).findFirst().orElse(null); + dto1.getLedgerIds().addAll(deviceImportDTO.getLedgerIds()); + } else { + deviceImportDTOList.add(deviceImportDTO); + } + }); + List busDeviceList = new ArrayList<>(); + deviceImportDTOList.forEach(deviceImportDTO -> { busDeviceList.add(new BusDevice(deviceImportDTO.getDevCode(), deviceImportDTO.getDeviceType(), deviceImportDTO.getProductId(), diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 62fb1ed..c821c72 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -25,6 +25,8 @@ List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); + List getBusLedgers(); + boolean addRemark(BusLedgerDTO request); BusLedger detail(Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 284bb01..4fef87c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -29,6 +29,8 @@ Map>> watchDataByWell(DeviceMonitorRequestDTO requestDTO); + Map> latestValue(DeviceMonitorRequestDTO requestDTO); + List lifecycleRecord(DeviceMonitorRequestDTO requestDTO); List repairLog(DeviceMonitorRequestDTO requestDTO); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 13a8e74..4b0c2d6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -125,9 +125,9 @@ List gasDtoList = new ArrayList<>(); List> objectList = this.monitorData(requestDTO); objectList.forEach(object -> { - gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object,"devcode"), CommonUtil.getString(object,"strength"), - CommonUtil.getString(object,"cell"), CommonUtil.getString(object,"pci"), - CommonUtil.getString(object,"uptime"), CommonUtil.getString(object,"logtime"))); + gasDtoList.add(new DataGasExcelDTO(CommonUtil.getString(object, "devcode"), CommonUtil.getString(object, "strength"), + CommonUtil.getString(object, "cell"), CommonUtil.getString(object, "pci"), + CommonUtil.getString(object, "uptime"), CommonUtil.getString(object, "logtime"))); }); iBaseExportService.exportExcel(response, DataGasExcelDTO.class, gasDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -135,9 +135,9 @@ List tubeDtoList = new ArrayList<>(); List> objectTubeList = this.monitorData(requestDTO); objectTubeList.forEach(object -> { - tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"GASVAL"), - CommonUtil.getString(object,"VBAT"), CommonUtil.getString(object,"RSRP"), - CommonUtil.getString(object,"UPTIME"), CommonUtil.getString(object,"LOGTIME"))); + tubeDtoList.add(new DataTubeExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "GASVAL"), + CommonUtil.getString(object, "VBAT"), CommonUtil.getString(object, "RSRP"), + CommonUtil.getString(object, "UPTIME"), CommonUtil.getString(object, "LOGTIME"))); }); iBaseExportService.exportExcel(response, DataTubeExcelDTO.class, tubeDtoList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -145,15 +145,15 @@ List dtoPipeOtherList = new ArrayList<>(); List> pipeOtherObjectList = this.monitorData(requestDTO); pipeOtherObjectList.forEach(object -> { - dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object,"DEVCODE"), CommonUtil.getString(object,"LEFT_LENGTH"), - CommonUtil.getString(object,"RIGHT_LENGTH"), CommonUtil.getString(object,"TEMPERATURE"), - CommonUtil.getString(object,"HUMIDITY"), CommonUtil.getString(object,"VBAT"), - "1".equals(CommonUtil.getString(object,"PIPE_INCLINE_ALARM"))?"是":"否", CommonUtil.getString(object,"UPTIME"), - CommonUtil.getString(object,"LOGTIME"), "1".equals(CommonUtil.getString(object,"PIPE_BREAK_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"GAS_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"LEFT_OFF_LINE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"LEFT_VIBRATE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"RIGHT_VIBRATE_ALARM"))?"是":"否", - "1".equals(CommonUtil.getString(object,"RIGHT_OFF_LINE_ALARM"))?"是":"否", "1".equals(CommonUtil.getString(object,"PICTURE_ALARM"))?"是":"否", - CommonUtil.getString(object,"LEFT_GAS"), CommonUtil.getString(object,"RIGHT_GAS"))); + dtoPipeOtherList.add(new DataPipeOtherExcelDTO(CommonUtil.getString(object, "DEVCODE"), CommonUtil.getString(object, "LEFT_LENGTH"), + CommonUtil.getString(object, "RIGHT_LENGTH"), CommonUtil.getString(object, "TEMPERATURE"), + CommonUtil.getString(object, "HUMIDITY"), CommonUtil.getString(object, "VBAT"), + "1".equals(CommonUtil.getString(object, "PIPE_INCLINE_ALARM")) ? "是" : "否", CommonUtil.getString(object, "UPTIME"), + CommonUtil.getString(object, "LOGTIME"), "1".equals(CommonUtil.getString(object, "PIPE_BREAK_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "GAS_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "LEFT_OFF_LINE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "LEFT_VIBRATE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "RIGHT_VIBRATE_ALARM")) ? "是" : "否", + "1".equals(CommonUtil.getString(object, "RIGHT_OFF_LINE_ALARM")) ? "是" : "否", "1".equals(CommonUtil.getString(object, "PICTURE_ALARM")) ? "是" : "否", + CommonUtil.getString(object, "LEFT_GAS"), CommonUtil.getString(object, "RIGHT_GAS"))); }); iBaseExportService.exportExcel(response, DataPipeOtherExcelDTO.class, dtoPipeOtherList, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); break; @@ -286,6 +286,7 @@ List list = new ArrayList<>(); if (!CollectionUtil.isEmpty(results)) { List baseDeviceTypes = deviceTypeService.list(); + List busLedgerDTOList = iBusLedgerService.getBusLedgers(); final Integer[] index = {0}; results.forEach(deviceImportDTO -> { index[0]++; @@ -304,7 +305,16 @@ }); //若安装位号不为空，检查是否存在 if (ObjectUtil.isNotEmpty(deviceImportDTO.getTagNumber())) { - List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); +// List ledgerIds = iBusLedgerService.ledgerIdsByTagNumber(deviceImportDTO.getTagNumber(), deviceImportDTO.getWatchObject(), deviceImportDTO.getDeptid()); + List ledgerIds = new ArrayList<>(); + + busLedgerDTOList.forEach(busLedgerDTO -> { + if (deviceImportDTO.getTagNumber().equals(busLedgerDTO.getTagNumber()) && + deviceImportDTO.getWatchObject().equals(busLedgerDTO.getType()) && + deviceImportDTO.getDeptid().equals(busLedgerDTO.getDeptid())) { + ledgerIds.add(busLedgerDTO.getId()); + } + }); if (null == ledgerIds || ledgerIds.size() < 1) { list.add("第" + index[0] + "行，安装位号不存在！"); return; @@ -318,19 +328,25 @@ } List busDeviceList = BusDevice.convertDeviceList(results); - //保存设备信息 - this.saveBatch(busDeviceList); - List busDeviceLedgers = new ArrayList<>(); + try { + //保存设备信息 + this.saveBatch(busDeviceList); - busDeviceList.forEach(device -> { - for (Long ledgerId : device.getLedgerIds()) { - busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + List busDeviceLedgers = new ArrayList<>(); + + busDeviceList.forEach(device -> { + for (Long ledgerId : device.getLedgerIds()) { + busDeviceLedgers.add(new BusDeviceLedger(device.getId(), ledgerId, device.getWatchObject())); + } + }); + if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { + this.busDeviceLedgerService.saveBatch(busDeviceLedgers); } - }); - if (CollectionUtil.isNotEmpty(busDeviceLedgers)) { - this.busDeviceLedgerService.saveBatch(busDeviceLedgers); + }catch (Exception e){ + e.printStackTrace(); } + } else { list.add("导入数据不能为空"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index 7feeb89..c856fa8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -73,7 +73,10 @@ } - + @Override + public List getBusLedgers() { + return this.baseMapper.getBusLedgers(); + } @Override public BusLedger detail(Long id) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 604cac0..2c1dda5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,6 +60,21 @@ return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } + + @Override + public Map> latestValue(DeviceMonitorRequestDTO request) { + Map> resultMap = new HashMap<>(); + List deviceMonitorDTOList = this.baseMapper.getDeviceList(request.getWellId()); + for (DeviceMonitorDTO deviceMonitorDTO : deviceMonitorDTOList) { + Map map = new HashMap<>(); + map.put("value",deviceMonitorDTO.getLatestValue()); + map.put("state",deviceMonitorDTO.getState()); + map.put("devcode",deviceMonitorDTO.getDevcode()); + resultMap.put(deviceMonitorDTO.getDevTypeName(), map); + } + return resultMap; + } + @Override public Map>> watchDataByWell(DeviceMonitorRequestDTO request) { Map>> resultMap = new HashMap<>(); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index e539848..3eeb4b6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: Casic203 jms: