diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java new file mode 100644 index 0000000..1b02250 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -0,0 +1,19 @@ +package com.casic.missiles.util; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.response.ResponseData; + + +public class TimeConvertUtil { + public static String TimeConverter(String totalMinutesStr){ + if(ObjectUtil.isNotEmpty(totalMinutesStr)){ + int totalMinutes = Integer.valueOf(totalMinutesStr); + int days = totalMinutes/(24*60); + int hours = (totalMinutes%(24*60))/60; + int minutes = totalMinutes%60; + return String.format("%d天%d时%d分",days,hours,minutes); + } + return ""; + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java new file mode 100644 index 0000000..1b02250 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -0,0 +1,19 @@ +package com.casic.missiles.util; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.response.ResponseData; + + +public class TimeConvertUtil { + public static String TimeConverter(String totalMinutesStr){ + if(ObjectUtil.isNotEmpty(totalMinutesStr)){ + int totalMinutes = Integer.valueOf(totalMinutesStr); + int days = totalMinutes/(24*60); + int hours = (totalMinutes%(24*60))/60; + int minutes = totalMinutes%60; + return String.format("%d天%d时%d分",days,hours,minutes); + } + return ""; + } +} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java deleted file mode 100644 index 0e5009b..0000000 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.app.controller; - - -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -@Api(tags = "app对接模块") -@RequiredArgsConstructor -@RestController -@RequestMapping("/api") -public class ApiController { - private final IAlarmRecordsService iAlarmRecordsService; - //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 - - @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") - @ResponseBody - public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 - return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); - } - - -} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java new file mode 100644 index 0000000..1b02250 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -0,0 +1,19 @@ +package com.casic.missiles.util; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.response.ResponseData; + + +public class TimeConvertUtil { + public static String TimeConverter(String totalMinutesStr){ + if(ObjectUtil.isNotEmpty(totalMinutesStr)){ + int totalMinutes = Integer.valueOf(totalMinutesStr); + int days = totalMinutes/(24*60); + int hours = (totalMinutes%(24*60))/60; + int minutes = totalMinutes%60; + return String.format("%d天%d时%d分",days,hours,minutes); + } + return ""; + } +} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java deleted file mode 100644 index 0e5009b..0000000 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.app.controller; - - -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -@Api(tags = "app对接模块") -@RequiredArgsConstructor -@RestController -@RequestMapping("/api") -public class ApiController { - private final IAlarmRecordsService iAlarmRecordsService; - //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 - - @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") - @ResponseBody - public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 - return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); - } - - -} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java new file mode 100644 index 0000000..a496d98 --- /dev/null +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.appOther.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app对接模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/api") +public class ApiController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java new file mode 100644 index 0000000..1b02250 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -0,0 +1,19 @@ +package com.casic.missiles.util; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.response.ResponseData; + + +public class TimeConvertUtil { + public static String TimeConverter(String totalMinutesStr){ + if(ObjectUtil.isNotEmpty(totalMinutesStr)){ + int totalMinutes = Integer.valueOf(totalMinutesStr); + int days = totalMinutes/(24*60); + int hours = (totalMinutes%(24*60))/60; + int minutes = totalMinutes%60; + return String.format("%d天%d时%d分",days,hours,minutes); + } + return ""; + } +} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java deleted file mode 100644 index 0e5009b..0000000 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.app.controller; - - -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -@Api(tags = "app对接模块") -@RequiredArgsConstructor -@RestController -@RequestMapping("/api") -public class ApiController { - private final IAlarmRecordsService iAlarmRecordsService; - //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 - - @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") - @ResponseBody - public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 - return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); - } - - -} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java new file mode 100644 index 0000000..a496d98 --- /dev/null +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.appOther.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app对接模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/api") +public class ApiController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 4c0fab4..2d7326d 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -134,6 +134,11 @@ casic-rest-api ${pro.version} + + com.casic + casic-app + ${pro.version} + org.springframework.boot diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index d14a081..76bedfd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -55,22 +55,15 @@ @ApiOperation("查询历史告警分页接口") @PostMapping("/historyListPage") @ResponseBody - public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page,request,dataScope))); } -// @ApiOperation("新增") -// @PostMapping("/add") -// @ResponseBody -// public ReturnDTO add(@RequestBody AlarmRecords alarmRecords) { -// -// return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); -// } @ApiOperation("查看") @PostMapping("/view") 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 ea8828a..9a6eb2e 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 @@ -20,11 +20,13 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); - Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); - Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope,@Param("deptIdStr") String deptIdStr); AlarmRecords view(@Param("id") Long id); 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 20469fe..ac236b7 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 @@ -26,34 +26,6 @@ - - + + + + + @@ -140,17 +263,17 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml index 35b366f..335333e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml @@ -26,26 +26,31 @@ WITH alarm_position_group as(SELECT count(1) as alarmSum,ledgerCode FROM `alarm_records_view` av - + where av.exceptionType=0 + and av.alarmTime >= CURDATE() @@ -72,7 +78,6 @@ and av.watchObject = #{request.ledgerType} - GROUP BY ledgerCode) SELECT ap.alarmSum,bv.type,tagNumber,bv.ledgerName,bv.place,bv.deptid,ad.FULL_NAME as deptName, bv.marker FROM alarm_position_group ap left join bus_ledger_all_view bv on ap.ledgerCode=bv.ledgerCode @@ -82,31 +87,29 @@ SELECT count( 1 ) AS alarmSum, alarmType,DEPTID FROM alarm_records_view av + where av.exceptionType=0 - - - and av.alarmTime >= CURDATE() - - - and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY - - - and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') - - - and av.alarmTime >= #{request.begTime} - - - and av.alarmTime #{request.endTime} - - - and av.watchObject = #{request.ledgerType} - - - and av.DEPTID in (${deptStrs}) - - + + and av.alarmTime >= CURDATE() + + + and av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY + + + and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01') + + + and av.alarmTime >= #{request.begTime} + + + and av.alarmTime #{request.endTime} + + + and av.watchObject = #{request.ledgerType} + + + and av.DEPTID in (${deptStrs}) + GROUP BY av.alarmType ,av.DEPTID diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java index eae86c4..e1d07a3 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmOverDTO.java @@ -10,6 +10,6 @@ @ApiModelProperty("报警数量") private Long sum; - @ApiModelProperty("0：正在报警，1：今日报警，2：本周报警，3：本月报警，4：全年报警 ") + @ApiModelProperty("1：正在报警，2：今日报警，3：本周报警，4：本月报警，5：全年报警 ") private String type; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java index b91028f..59ca150 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRecordDTO.java @@ -9,8 +9,8 @@ @ApiModelProperty("设备编号") private String devCode; - @ApiModelProperty("报警类型") - private String alarmType; + @ApiModelProperty("报警类型id") + private Long alarmTypeId; @ApiModelProperty("报警等级") private String alarmLevel; @@ -27,7 +27,7 @@ @ApiModelProperty("厂商") private Long manufactureId; - @ApiModelProperty("报警状态") + @ApiModelProperty("报警状态,1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置") private String processStatus; @ApiModelProperty("报警开始时间") @@ -36,4 +36,7 @@ @ApiModelProperty("报警结束时间") private String endTime; + @ApiModelProperty("是否误报（1：是，真报警，0：否，误报）") + private String realAlarm; + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java index ca81388..2e5d8dc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java @@ -33,4 +33,13 @@ @ApiModelProperty("报警时间") private String alarmTime; + @ApiModelProperty("解除时间") + private String cancelTime; + + @ApiModelProperty("解除时长") + private String cancelDuration; + + @ApiModelProperty("设备类型名称") + private String devTypeName; + } 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 820c173..3160355 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 @@ -30,6 +30,8 @@ Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + AlarmRecords view(Long id); boolean suspend(SuspendDTO suspendDTO); 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 f1d77b3..36ba638 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 @@ -2,9 +2,11 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.enums.ApprovalStatusEnum; @@ -31,6 +33,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 报警管理（暂定） 服务实现类 @@ -47,11 +51,12 @@ private final AbstractPermissionContext permissionContext; private final SuspendLogMapper suspendLogMapper; private final RemindLogMapper remindLogMapper; + private final AbstractDeptService abstractDeptService; @Override public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -61,7 +66,7 @@ @Override public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope); + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -84,15 +89,26 @@ @Override public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope); + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, dataScope,getDeptIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { - alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); + alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "否" : "是"); }); return alarmRecordsPage; } @Override + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, dataScope,getDeptIds(request.getDeptId())); + List deviceAlarmList = deviceAlarmListPage.getRecords(); + deviceAlarmList.forEach(deviceAlarm -> { + deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); + deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); + }); + return deviceAlarmListPage; + } + + @Override public AlarmRecords view(Long id) { AlarmRecords alarmRecords = this.baseMapper.view(id); alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); @@ -168,4 +184,15 @@ public boolean processByApp(Map resultParams) { return false; } + + + public String getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } } diff --git a/casic-app/pom.xml b/casic-app/pom.xml new file mode 100644 index 0000000..24e9002 --- /dev/null +++ b/casic-app/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.casic + casic-iot-platform + 2.0.0.alpha + ../pom.xml + + + casic-app + 2.0.0 + jar + casic-app + casic app端后台子包 + + + + + com.casic + casic-core + ${core.version} + + + com.casic + casic-admin-support + ${admin.version} + + + + + + + + + + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 + + + + io.swagger + swagger-annotations + 1.5.18 + compile + + + + + + + + + + + junit + junit + test + + + com.casic + casic-alarm + 2.0.0 + + + + + + + src/main/java + + **/*.xml + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..de7f569 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.app.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app端后台模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} 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 ecc55c6..bca0684 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 com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; +import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ import java.util.Map; import java.util.stream.Collectors; +import static com.casic.missiles.util.TimeConvertUtil.TimeConverter; + /** *

* 台账管理 服务实现类 @@ -100,16 +103,4 @@ return lifeCycleRecordDTOList; } - public String TimeConverter(String totalMinutesStr){ - if(ObjectUtil.isNotEmpty(totalMinutesStr)){ - int totalMinutes = Integer.valueOf(totalMinutesStr); - int days = totalMinutes/(24*60); - int hours = (totalMinutes%(24*60))/60; - int minutes = totalMinutes%60; - return String.format("%d天%d时%d分",days,hours,minutes); - } - return ""; - } - - } diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java new file mode 100644 index 0000000..1b02250 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -0,0 +1,19 @@ +package com.casic.missiles.util; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.response.ResponseData; + + +public class TimeConvertUtil { + public static String TimeConverter(String totalMinutesStr){ + if(ObjectUtil.isNotEmpty(totalMinutesStr)){ + int totalMinutes = Integer.valueOf(totalMinutesStr); + int days = totalMinutes/(24*60); + int hours = (totalMinutes%(24*60))/60; + int minutes = totalMinutes%60; + return String.format("%d天%d时%d分",days,hours,minutes); + } + return ""; + } +} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java deleted file mode 100644 index 0e5009b..0000000 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/app/controller/ApiController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.app.controller; - - -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -@Api(tags = "app对接模块") -@RequiredArgsConstructor -@RestController -@RequestMapping("/api") -public class ApiController { - private final IAlarmRecordsService iAlarmRecordsService; - //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 - - @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") - @ResponseBody - public Object getProcessResult(@RequestBody Map resultParams) { - //todo:协议待定 - return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); - } - - -} diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java new file mode 100644 index 0000000..a496d98 --- /dev/null +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.appOther.controller; + + +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +@Api(tags = "app对接模块") +@RequiredArgsConstructor +@RestController +@RequestMapping("/api") +public class ApiController { + private final IAlarmRecordsService iAlarmRecordsService; + //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 + + @ApiOperation("接收app处置结果") + @PostMapping("/receiveProcessResult") + @ResponseBody + public Object getProcessResult(@RequestBody Map resultParams) { + //todo:协议待定 + return ResponseData.success(iAlarmRecordsService.processByApp(resultParams)); + } + + +} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 4c0fab4..2d7326d 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -134,6 +134,11 @@ casic-rest-api ${pro.version} + + com.casic + casic-app + ${pro.version} + org.springframework.boot diff --git a/pom.xml b/pom.xml index 8973129..d5f24e9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ casic-data casic-job casic-rest-api + casic-app com.casic