diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + AlarmRecords view(@Param("id") Long id); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml index b685a5d..2b34c63 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml @@ -70,10 +70,10 @@ and bd.CELL #{request.cell} - + and bd.LOGTIME = ]]> #{request.logtime1} - + and bd.LOGTIME #{request.logtime2} ORDER BY bd.INSTALL_DATE DESC diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml index b685a5d..2b34c63 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml @@ -70,10 +70,10 @@ and bd.CELL #{request.cell} - + and bd.LOGTIME = ]]> #{request.logtime1} - + and bd.LOGTIME #{request.logtime2} ORDER BY bd.INSTALL_DATE DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java index 0e73580..88a3524 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java @@ -37,8 +37,9 @@ private String valid; @ApiModelProperty("最新上传开始时间") - private String logtime1; + private String logTime1; + @ApiModelProperty("最新上传结束时间") - private String logtime2; + private String logTime2; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml index b685a5d..2b34c63 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml @@ -70,10 +70,10 @@ and bd.CELL #{request.cell} - + and bd.LOGTIME = ]]> #{request.logtime1} - + and bd.LOGTIME #{request.logtime2} ORDER BY bd.INSTALL_DATE DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java index 0e73580..88a3524 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java @@ -37,8 +37,9 @@ private String valid; @ApiModelProperty("最新上传开始时间") - private String logtime1; + private String logTime1; + @ApiModelProperty("最新上传结束时间") - private String logtime2; + private String logTime2; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java index 8e837be..6ff3639 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; @@ -17,7 +18,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO); + Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); boolean saveDevice(BusDevice busDevice); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml index b685a5d..2b34c63 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml @@ -70,10 +70,10 @@ and bd.CELL #{request.cell} - + and bd.LOGTIME = ]]> #{request.logtime1} - + and bd.LOGTIME #{request.logtime2} ORDER BY bd.INSTALL_DATE DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java index 0e73580..88a3524 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java @@ -37,8 +37,9 @@ private String valid; @ApiModelProperty("最新上传开始时间") - private String logtime1; + private String logTime1; + @ApiModelProperty("最新上传结束时间") - private String logtime2; + private String logTime2; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java index 8e837be..6ff3639 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; @@ -17,7 +18,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO); + Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 19cee39..474a31b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; @@ -59,8 +60,8 @@ @Override - public Page listPage(Page page, BusDeviceDTO request) { - Page busDevicePage = this.baseMapper.pageList(page, request); + public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { + Page busDevicePage = this.baseMapper.pageList(page, request,dataScope); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index de028da..3bb3564 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -6,7 +6,9 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -39,14 +41,28 @@ private final IAlarmRecordsService iAlarmRecordsService; private final AbstractPermissionContext permissionContext; - @ApiOperation("查询分页接口") + @ApiOperation("查询当前告警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody AlarmRecordDTO request) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page,request,dataScope))); + } + + @ApiOperation("查询历史告警分页接口") + @PostMapping("/historyListPage") + @ResponseBody + public ReturnDTO historyListPage(@RequestBody AlarmRecordDTO request) { + + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + + Page page = PageFactory.defaultPage(); + + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page,request,dataScope))); } // @ApiOperation("新增") @@ -57,15 +73,15 @@ // return ReturnUtil.success(iAlarmRecordsService.saveAlarmType(alarmRecords)); // } -// @ApiOperation("编辑") -// @PostMapping("/edit") -// @ResponseBody -// public ReturnDTO edit(@RequestBody AlarmRecords alarmRecords) { -// Assert.isFalse(Objects.isNull(alarmRecords.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(iAlarmRecordsService.updateById(alarmRecords)); -// } + @ApiOperation("查看") + @PostMapping("/view") + @ResponseBody + public ReturnDTO edit(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(iAlarmRecordsService.view(idDTO.getId())); + } @ApiOperation("批量删除") @PostMapping("/batchDelete") 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 cee2bbc..19c050d 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,10 @@ @Mapper public interface AlarmRecordsMapper extends BaseMapper { - Page pageList(Page page, @Param("request") AlarmRecordDTO request); + Page pageList(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + Page historyListPage(Page page, @Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope); + + 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 681499c..7f4324e 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 @@ -29,9 +29,10 @@ rd.*, bt.TYPE_NAME AS devTypeName, lr.POSITION, - lr.TAG_NUMBER as tagNumber + lr.TAG_NUMBER as tagNumber, + lr.DEPTID as deptid FROM - alarm_rule_device rd + alarm_records rd LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID @@ -39,16 +40,66 @@ LEFT JOIN bus_ledger lr ON lr.ID = bl.LEDGER_ID AND bl.VALID = 1 AND lr.VALID =1 - where 1=1 - + where rd.STATUS =1 and rd.DEVCODE like concat('%', #{request.devCode}, '%') and bd.DEVICE_TYPE =#{request.devTypeId} - ORDER BY rd.TS DESC + + + + + 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 d1c408d..80779a9 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 @@ -12,6 +12,9 @@ @ApiModelProperty("报警类型") private String alarmType; + @ApiModelProperty("报警等级") + private String alarmLevel; + @ApiModelProperty("设备类型id") private Long devTypeId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java index 092bd53..facec65 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java @@ -75,6 +75,10 @@ @TableField("PROCESS_TIME") private Date processTime; + @ApiModelProperty("解除时间") + @TableField("CANCEL_TIME") + private Date cancelTime; + @ApiModelProperty("创建事件") @TableField("TS") private Date ts; @@ -83,5 +87,15 @@ @TableField("POSITION") private String position; + @ApiModelProperty("是否误报（0：是，1：否）") + @TableField("REAL_ALARM") + private String realAlarm; + @ApiModelProperty("产权单位") + @TableField(exist = false) + private String responsibleDeptName; + + @ApiModelProperty("管理单位") + @TableField(exist = false) + private String deptName; } 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 9a8ff64..812d274 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -15,6 +16,10 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request); + Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + + Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + + boolean view(Long id); } 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 c2d4db6..8e8cfa2 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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.AlarmRecordsMapper; import com.casic.missiles.modular.alarm.dto.AlarmRecordDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; @@ -20,8 +21,20 @@ public class AlarmRecordsServiceImpl extends ServiceImpl implements IAlarmRecordsService { @Override - public Page pageList(Page page, AlarmRecordDTO request) { + public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { - return this.baseMapper.pageList(page,request); + return this.baseMapper.pageList(page,request,dataScope); + } + + @Override + public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { + + return this.baseMapper.historyListPage(page,request,dataScope); + } + + @Override + public boolean view(Long id) { + AlarmRecords alarmRecords = this.baseMapper.view(id); + return false; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java index 8feb060..275a1ee 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; @@ -41,7 +42,7 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext permissionContext; + private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -49,8 +50,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusDeviceDTO request) { + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page,request,dataScope))); } @ApiOperation("新增") @@ -87,7 +89,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page,request); + Page devicePage = iBusDeviceService.listPage(page,request,iCommonPermissionService.getAuthService().getLoginUserDataScope()); try { iBaseExportService.exportExcel(response, BusDevice.class, devicePage.getRecords(), ExportEnum.DEVICE_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java index 8922224..15c9792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,6 @@ @Mapper public interface BusDeviceMapper extends BaseMapper { - Page pageList(Page page, @Param("request") BusDeviceDTO request); + Page pageList(Page page, @Param("request") BusDeviceDTO request,@Param("scope") DataScope dataScope); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml index b685a5d..2b34c63 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml @@ -70,10 +70,10 @@ and bd.CELL #{request.cell} - + and bd.LOGTIME = ]]> #{request.logtime1} - + and bd.LOGTIME #{request.logtime2} ORDER BY bd.INSTALL_DATE DESC diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java index 0e73580..88a3524 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusDeviceDTO.java @@ -37,8 +37,9 @@ private String valid; @ApiModelProperty("最新上传开始时间") - private String logtime1; + private String logTime1; + @ApiModelProperty("最新上传结束时间") - private String logtime2; + private String logTime2; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java index 8e837be..6ff3639 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.device.dto.BusDeviceDTO; import com.casic.missiles.modular.device.entity.BusDevice; @@ -17,7 +18,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO); + Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java index 19cee39..474a31b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; @@ -59,8 +60,8 @@ @Override - public Page listPage(Page page, BusDeviceDTO request) { - Page busDevicePage = this.baseMapper.pageList(page, request); + public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { + Page busDevicePage = this.baseMapper.pageList(page, request,dataScope); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java new file mode 100644 index 0000000..f817b78 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/enums/ApprovalStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums; + +//1:未读，2：已读，3，挂起，4：待现场确认，5：已确认，6：待处置，7：已处置 + +public interface ApprovalStatusEnum { + String PROCESS_STATUS = "processStatus"; + //未读 + String UNREAD = "1"; + //已读 + String READ = "2"; + //挂起 + String SUSPEND = "3"; + //待现场确认 + String UNCONFIRM = "4"; + //已确认 + String CONFIRMED = "5"; + //待处置 + String UNPROCESS = "6"; + //已处置 + String PROCESSED = "7"; + //删除 + String DELETED = "8"; +}