diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java index a48fde4..2571222 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +14,7 @@ import com.casic.missiles.modular.device.dto.BusPipelineRequestDTO; import com.casic.missiles.modular.device.entity.BusPipeline; import com.casic.missiles.modular.device.service.IBusPipelineService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -45,12 +43,14 @@ final private AbstractDictService abstractDictService; + final private CommonServer commonServer; + @Override public Page listPage(Page page, BusPipelineRequestDTO requestDTO) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); - Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, getDeptIds(requestDTO.getDeptid())); + Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, commonServer.getDeptScopeIds(requestDTO.getDeptid())); List busPipelineList = pipelinePage.getRecords(); @@ -60,33 +60,13 @@ busPipeline.setPressTypeName(abstractDictService.getDictNameByCode("wellType", busPipeline.getPressType())); - busPipeline.setDeptName(getDeptNamesByDeptId(busPipeline.getDeptid())); + busPipeline.setDeptName(commonServer.getDeptNamesByDeptId(busPipeline.getDeptid())); }); return pipelinePage; } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - @Transactional @Override @@ -115,7 +95,7 @@ List busPipelineList = new ArrayList<>(); for (BusPipelineImportDTO importDTO : results) { BusPipeline busPipeline = new BusPipeline(); - BeanUtils.copyProperties(importDTO,busPipeline ); + BeanUtils.copyProperties(importDTO, busPipeline); busPipeline.setManageType(PipeInfoEnum.getValue(importDTO.getManageType())); busPipeline.setPressType(PipeInfoEnum.getValue(importDTO.getPressType())); busPipelineList.add(busPipeline); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java index a48fde4..2571222 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +14,7 @@ import com.casic.missiles.modular.device.dto.BusPipelineRequestDTO; import com.casic.missiles.modular.device.entity.BusPipeline; import com.casic.missiles.modular.device.service.IBusPipelineService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -45,12 +43,14 @@ final private AbstractDictService abstractDictService; + final private CommonServer commonServer; + @Override public Page listPage(Page page, BusPipelineRequestDTO requestDTO) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); - Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, getDeptIds(requestDTO.getDeptid())); + Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, commonServer.getDeptScopeIds(requestDTO.getDeptid())); List busPipelineList = pipelinePage.getRecords(); @@ -60,33 +60,13 @@ busPipeline.setPressTypeName(abstractDictService.getDictNameByCode("wellType", busPipeline.getPressType())); - busPipeline.setDeptName(getDeptNamesByDeptId(busPipeline.getDeptid())); + busPipeline.setDeptName(commonServer.getDeptNamesByDeptId(busPipeline.getDeptid())); }); return pipelinePage; } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - @Transactional @Override @@ -115,7 +95,7 @@ List busPipelineList = new ArrayList<>(); for (BusPipelineImportDTO importDTO : results) { BusPipeline busPipeline = new BusPipeline(); - BeanUtils.copyProperties(importDTO,busPipeline ); + BeanUtils.copyProperties(importDTO, busPipeline); busPipeline.setManageType(PipeInfoEnum.getValue(importDTO.getManageType())); busPipeline.setPressType(PipeInfoEnum.getValue(importDTO.getPressType())); busPipelineList.add(busPipeline); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 587ea1e..bf968ef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -1,12 +1,7 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DeviceDataEnum; @@ -19,7 +14,7 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -44,12 +39,11 @@ private final AbstractDictService abstractDictService; private final IBusLedgerService iBusLedgerService; - private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(getDeptScopeIds(request.getDeptid()), page, request); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 @@ -57,7 +51,7 @@ busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 busLedger.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 }); return pageList; } @@ -67,7 +61,7 @@ public List list(BusLedgerDTO request, DataScope dataScope) { // 地图不分页接口不再查字典值了 // 直接返回 - return this.baseMapper.list(getDeptScopeIds(request.getDeptid()), request); + return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override @@ -111,32 +105,4 @@ return lifeCycleRecordDTOList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java index a48fde4..2571222 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +14,7 @@ import com.casic.missiles.modular.device.dto.BusPipelineRequestDTO; import com.casic.missiles.modular.device.entity.BusPipeline; import com.casic.missiles.modular.device.service.IBusPipelineService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -45,12 +43,14 @@ final private AbstractDictService abstractDictService; + final private CommonServer commonServer; + @Override public Page listPage(Page page, BusPipelineRequestDTO requestDTO) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); - Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, getDeptIds(requestDTO.getDeptid())); + Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, commonServer.getDeptScopeIds(requestDTO.getDeptid())); List busPipelineList = pipelinePage.getRecords(); @@ -60,33 +60,13 @@ busPipeline.setPressTypeName(abstractDictService.getDictNameByCode("wellType", busPipeline.getPressType())); - busPipeline.setDeptName(getDeptNamesByDeptId(busPipeline.getDeptid())); + busPipeline.setDeptName(commonServer.getDeptNamesByDeptId(busPipeline.getDeptid())); }); return pipelinePage; } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - @Transactional @Override @@ -115,7 +95,7 @@ List busPipelineList = new ArrayList<>(); for (BusPipelineImportDTO importDTO : results) { BusPipeline busPipeline = new BusPipeline(); - BeanUtils.copyProperties(importDTO,busPipeline ); + BeanUtils.copyProperties(importDTO, busPipeline); busPipeline.setManageType(PipeInfoEnum.getValue(importDTO.getManageType())); busPipeline.setPressType(PipeInfoEnum.getValue(importDTO.getPressType())); busPipelineList.add(busPipeline); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 587ea1e..bf968ef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -1,12 +1,7 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DeviceDataEnum; @@ -19,7 +14,7 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -44,12 +39,11 @@ private final AbstractDictService abstractDictService; private final IBusLedgerService iBusLedgerService; - private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(getDeptScopeIds(request.getDeptid()), page, request); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 @@ -57,7 +51,7 @@ busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 busLedger.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 }); return pageList; } @@ -67,7 +61,7 @@ public List list(BusLedgerDTO request, DataScope dataScope) { // 地图不分页接口不再查字典值了 // 直接返回 - return this.baseMapper.list(getDeptScopeIds(request.getDeptid()), request); + return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override @@ -111,32 +105,4 @@ return lifeCycleRecordDTOList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - } diff --git a/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java new file mode 100644 index 0000000..3f33ca1 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java @@ -0,0 +1,87 @@ +package com.casic.missiles.server; + + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.modular.system.model.Dept; +import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@RequiredArgsConstructor +@Service +public class CommonServer { + + private final AbstractDeptService abstractDeptService; + private final AbstractPermissionContext permissionContext; + + @Cacheable(value = "deptNameCache", key = "#deptId") + public String getDeptNamesByDeptId(Long deptId) { + List deptIds = abstractDeptService.getParentListById(deptId); + deptIds.add(deptId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", deptIds); + queryWrapper.orderByAsc("pids"); + List deptList = abstractDeptService.list(queryWrapper); + List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); + return String.join("/", nameList); + } + + // @Cacheable(value = "deptIdsCache") + public String getDeptIds() { + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + + public List getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds; + } + return null; + } + + public String getDeptIdStrs(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + + @Cacheable(value = "deptScopeIdsCache", key = "#authUser.getId()") + public String getDeptIds(AuthUser authUser) { + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope() + .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + //todo:账户加缓存 + public String getDeptScopeIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } else { + //获取登录权限 + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java index a48fde4..2571222 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +14,7 @@ import com.casic.missiles.modular.device.dto.BusPipelineRequestDTO; import com.casic.missiles.modular.device.entity.BusPipeline; import com.casic.missiles.modular.device.service.IBusPipelineService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -45,12 +43,14 @@ final private AbstractDictService abstractDictService; + final private CommonServer commonServer; + @Override public Page listPage(Page page, BusPipelineRequestDTO requestDTO) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); - Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, getDeptIds(requestDTO.getDeptid())); + Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, commonServer.getDeptScopeIds(requestDTO.getDeptid())); List busPipelineList = pipelinePage.getRecords(); @@ -60,33 +60,13 @@ busPipeline.setPressTypeName(abstractDictService.getDictNameByCode("wellType", busPipeline.getPressType())); - busPipeline.setDeptName(getDeptNamesByDeptId(busPipeline.getDeptid())); + busPipeline.setDeptName(commonServer.getDeptNamesByDeptId(busPipeline.getDeptid())); }); return pipelinePage; } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - @Transactional @Override @@ -115,7 +95,7 @@ List busPipelineList = new ArrayList<>(); for (BusPipelineImportDTO importDTO : results) { BusPipeline busPipeline = new BusPipeline(); - BeanUtils.copyProperties(importDTO,busPipeline ); + BeanUtils.copyProperties(importDTO, busPipeline); busPipeline.setManageType(PipeInfoEnum.getValue(importDTO.getManageType())); busPipeline.setPressType(PipeInfoEnum.getValue(importDTO.getPressType())); busPipelineList.add(busPipeline); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 587ea1e..bf968ef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -1,12 +1,7 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DeviceDataEnum; @@ -19,7 +14,7 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -44,12 +39,11 @@ private final AbstractDictService abstractDictService; private final IBusLedgerService iBusLedgerService; - private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(getDeptScopeIds(request.getDeptid()), page, request); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 @@ -57,7 +51,7 @@ busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 busLedger.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 }); return pageList; } @@ -67,7 +61,7 @@ public List list(BusLedgerDTO request, DataScope dataScope) { // 地图不分页接口不再查字典值了 // 直接返回 - return this.baseMapper.list(getDeptScopeIds(request.getDeptid()), request); + return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override @@ -111,32 +105,4 @@ return lifeCycleRecordDTOList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - } diff --git a/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java new file mode 100644 index 0000000..3f33ca1 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java @@ -0,0 +1,87 @@ +package com.casic.missiles.server; + + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.modular.system.model.Dept; +import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@RequiredArgsConstructor +@Service +public class CommonServer { + + private final AbstractDeptService abstractDeptService; + private final AbstractPermissionContext permissionContext; + + @Cacheable(value = "deptNameCache", key = "#deptId") + public String getDeptNamesByDeptId(Long deptId) { + List deptIds = abstractDeptService.getParentListById(deptId); + deptIds.add(deptId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", deptIds); + queryWrapper.orderByAsc("pids"); + List deptList = abstractDeptService.list(queryWrapper); + List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); + return String.join("/", nameList); + } + + // @Cacheable(value = "deptIdsCache") + public String getDeptIds() { + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + + public List getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds; + } + return null; + } + + public String getDeptIdStrs(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + + @Cacheable(value = "deptScopeIdsCache", key = "#authUser.getId()") + public String getDeptIds(AuthUser authUser) { + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope() + .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + //todo:账户加缓存 + public String getDeptScopeIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } else { + //获取登录权限 + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + } + +} diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java index 51e06ec..71a84d0 100644 --- a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -49,8 +49,7 @@ DateTime dateTime1= DateUtil.parseDateTime(begTime); DateTime dateTime2= DateUtil.parseDateTime(endTime); int betweenDay = (int) ((dateTime2.getTime() - dateTime1.getTime()) / (1000 * 60 * 60 * 24)); - betweenDays.add(DateUtil.beginOfMonth(new Date()).toString("yyyy-MM-dd")); - for(int i=1;i<=betweenDay;i++){ + for(int i=0;i<=betweenDay;i++){ betweenDays.add(DateUtil.offsetDay(dateTime1,i).toString("yyyy-MM-dd")); } return betweenDays; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java index af4fcc1..2e46afa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmDeviceController.java @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -42,16 +40,16 @@ public class AlarmDeviceController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @ApiOperation("设备报警分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO deviceAlarmListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmListPage(page, request))); } @ApiOperation("导出设备报警列表") @@ -70,18 +68,17 @@ @ResponseBody public ReturnDTO deviceAlarmHistoryListPage(@RequestBody AlarmRecordDTO request) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.deviceAlarmHistoryListPage(page, request))); } @ApiOperation("导出设备历史报警列表") @RequestMapping(value = "/batchExportDeviceAlarmHistoryList", method = RequestMethod.GET) public void batchDeviceAlarmHistoryList(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request, dataScope); + + List dtoList = iAlarmRecordsService.batchExportDeviceAlarmHistoryList(request); try { iBaseExportService.exportExcel(response, AlarmDeviceHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_DEVICE_HISTORY_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 a8e6bb5..3edbb9f 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 @@ -3,10 +3,8 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -43,25 +41,23 @@ public class AlarmRecordsController extends ExportController { private final IAlarmRecordsService iAlarmRecordsService; - private final AbstractPermissionContext permissionContext; + private final IBaseExportService iBaseExportService; @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, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.pageList(page, request))); } @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))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.historyListPage(page, request))); } @ApiOperation("查询历史告警详情") @@ -78,8 +74,7 @@ @ApiOperation("导出历史报警记录") @RequestMapping(value = "/batchExportHistory", method = RequestMethod.GET) public void batchExportHistory(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.batchExportHistory(request, dataScope); + List dtoList = iAlarmRecordsService.batchExportHistory(request); try { iBaseExportService.exportExcel(response, AlarmHistoryRecordExportDTO.class, dtoList, ExportEnum.ALARM_HISTORY_EXPORT.getSheetName()); } catch (Exception e) { @@ -91,8 +86,7 @@ @ApiOperation("导出当前告警记录") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(AlarmRecordDTO request, HttpServletResponse response) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - List dtoList = iAlarmRecordsService.allList(request, dataScope); + List dtoList = iAlarmRecordsService.allList(request); try { iBaseExportService.exportExcel(response, AlarmRecordExportDTO.class, dtoList, ExportEnum.ALARM_EXPORT.getSheetName()); } catch (Exception e) { @@ -164,9 +158,8 @@ @PostMapping("/tracksList") @ResponseBody public ReturnDTO tracksList(@RequestBody TrackRequestDTO requestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iAlarmRecordsService.tracksList(page, requestDTO))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java index b2a5367..b533ed5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmStaticsController.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.alarm.controller; -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.dto.ReturnDTO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.modular.alarm.dto.*; @@ -34,7 +32,6 @@ public class AlarmStaticsController extends ExportController { private final IAlarmStaticsService iAlarmStaticsService; - private final AbstractPermissionContext permissionContext; private final IBaseExportService iBaseExportService; @ApiOperation("报警总体情况") @@ -76,9 +73,8 @@ @ResponseBody public ReturnDTO alarmPosition(@RequestBody AlarmPositionRequestDTO alarmPositionRequestDTO) { - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); String alarmType = ""; - return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); + return ReturnUtil.success(iAlarmStaticsService.alarmPosition(alarmType, alarmPositionRequestDTO)); } 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 5888ceb..b4aa7ba 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 @@ -48,9 +48,9 @@ Page pop(Page page, @Param("deptIdStr") String deptIdStr); - List allList(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List allList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); - List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("dataScope") DataScope dataScope, @Param("deptIdStr") String deptIdStr); + List batchExportHistory(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr); List> viewPlace(@Param("request") TrackRequestDTO request); 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 47f6cde..e972c17 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 @@ -416,10 +416,10 @@ - + and rd.REAL_ALARM in ('1','2') - + and rd.REAL_ALARM =#{request.realAlarm} @@ -695,7 +695,13 @@ and rd.ALARM_TYPE_ID =#{request.alarmTypeId} - and rd.REAL_ALARM =#{request.realAlarm} + + + and rd.REAL_ALARM in ('1','2') + + + and rd.REAL_ALARM =#{request.realAlarm} + and rd.POSITION like concat('%', #{request.position}, '%') 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 0e1fd14..043ee52 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 @@ -20,19 +20,19 @@ */ public interface IAlarmRecordsService extends IService { - Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope); + Page pageList(Page page, AlarmRecordDTO request); - Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope); + Page tracksList(Page page, TrackRequestDTO request); - Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmListPage(Page page, AlarmRecordDTO request); Page pop(); - Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page historyListPage(Page page, AlarmRecordDTO request); - Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope); + Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request); - List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request,DataScope dataScope); + List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request); List batchExportDeviceAlarmList(AlarmRecordDTO request); @@ -62,9 +62,9 @@ List> viewPlace(TrackRequestDTO requestDTO); - List allList(AlarmRecordDTO request, DataScope dataScope); + List allList(AlarmRecordDTO request); - List batchExportHistory(AlarmRecordDTO request, DataScope dataScope); + List batchExportHistory(AlarmRecordDTO request); void cancelDeviceAlarm(String devCode); 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 fb3f925..aec86db 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 @@ -26,8 +26,8 @@ import com.casic.missiles.modular.alarm.service.IAlarmLevelControlService; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.alarm.service.IMessageLogService; -import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.CommonUtil; import com.casic.missiles.util.HttpClientUtils; import com.casic.missiles.util.PoolConfig; @@ -64,36 +64,37 @@ private final IMessageLogService iMessageLogService; private final WebSocket webSocket; private final PoolConfig threadPoolTaskExecutor; + private final CommonServer commonServer; @Value("${casic.brAppUrl}") private String brAppUrl; @Override - public Page pageList(Page page, AlarmRecordDTO request, DataScope dataScope) { + public Page pageList(Page page, AlarmRecordDTO request) { - Page alarmRecordsPage = this.baseMapper.pageList(page, request, getDeptIds(request.getDeptId())); + Page alarmRecordsPage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setProcessStatusName(ApprovalStatusEnum.getValue(alarmRecords.getProcessStatus())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); }); return alarmRecordsPage; } @Override - public Page tracksList(Page page, TrackRequestDTO request, DataScope dataScope) { - Page responseDTOPage = this.baseMapper.tracksList(page, request, getDeptIds(request.getDeptId())); + public Page tracksList(Page page, TrackRequestDTO request) { + Page responseDTOPage = this.baseMapper.tracksList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List trackResponseDTOList = responseDTOPage.getRecords(); trackResponseDTOList.forEach(trackResponseDTO -> { - trackResponseDTO.setDeptName(getDeptNamesByDeptId(trackResponseDTO.getDeptid())); + trackResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(trackResponseDTO.getDeptid())); trackResponseDTO.setCurrentPosition(trackResponseDTO.getLngGaode() + "," + trackResponseDTO.getLatGaode()); }); return responseDTOPage; } @Override - public Page deviceAlarmListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -105,7 +106,7 @@ @Override public List batchExportDeviceAlarmList(AlarmRecordDTO request) { - List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId())); + List alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmResponseDTOList.forEach(dto -> { dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus())); }); @@ -115,25 +116,19 @@ @Override public Page pop() { - String deptIdStr = ""; - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } Page page = PageFactory.defaultPage(); - Page alarmRecordsPage = this.baseMapper.pop(page, deptIdStr); + Page alarmRecordsPage = this.baseMapper.pop(page, commonServer.getDeptIds()); return alarmRecordsPage; } @Override - public Page historyListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, getDeptIds(request.getDeptId())); + public Page historyListPage(Page page, AlarmRecordDTO request) { + Page alarmRecordsPage = this.baseMapper.historyListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List alarmRecordsList = alarmRecordsPage.getRecords(); alarmRecordsList.forEach(alarmRecords -> { alarmRecords.setRealAlarmName(DictEnum.REAL_ALARM.equals(alarmRecords.getRealAlarm()) ? "是" : "否"); alarmRecords.setCancelDuration(TimeConverter(alarmRecords.getCancelDuration())); - alarmRecords.setDeptName(getDeptNamesByDeptId(alarmRecords.getDeptid())); + alarmRecords.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecords.getDeptid())); alarmRecords.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecords.getAlarmCategory())); }); return alarmRecordsPage; @@ -144,8 +139,8 @@ AlarmRecordDetailDTO detailDTO = this.baseMapper.historyAlarmDetail(id); detailDTO.setRealAlarmName(DictEnum.REAL_ALARM.equals(detailDTO.getRealAlarm()) ? "是" : "否"); detailDTO.setCancelDuration(TimeConverter(detailDTO.getCancelDuration())); - detailDTO.setDeptName(getDeptNamesByDeptId(detailDTO.getDeptid())); - detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(detailDTO.getLedgerName())); + detailDTO.setDeptName(commonServer.getDeptNamesByDeptId(detailDTO.getDeptid())); + detailDTO.setAddress(detailDTO.getLedgerNumber().concat("|").concat(ObjectUtil.isNotEmpty(detailDTO.getLedgerName()) ? detailDTO.getLedgerName() : detailDTO.getLedgerNumber())); detailDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", detailDTO.getAlarmCategory())); return detailDTO; } @@ -162,15 +157,15 @@ DeviceAlarmDetailDTO alarmDetail = this.baseMapper.deviceAlarmDetail(id); alarmDetail.setCancelDuration(TimeConverter(alarmDetail.getCancelDuration())); alarmDetail.setProcessDuration(TimeConverter(alarmDetail.getProcessDuration())); - alarmDetail.setDeptName(getDeptNamesByDeptId(alarmDetail.getDeptid())); + alarmDetail.setDeptName(commonServer.getDeptNamesByDeptId(alarmDetail.getDeptid())); alarmDetail.setAddress(alarmDetail.getTagNumber().concat("|").concat(alarmDetail.getLedgerName())); alarmDetail.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmDetail.getAlarmCategory())); return alarmDetail; } @Override - public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request, DataScope dataScope) { - Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, getDeptIds(request.getDeptId())); + public Page deviceAlarmHistoryListPage(Page page, AlarmRecordDTO request) { + Page deviceAlarmListPage = this.baseMapper.deviceAlarmHistoryListPage(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List deviceAlarmList = deviceAlarmListPage.getRecords(); deviceAlarmList.forEach(deviceAlarm -> { deviceAlarm.setProcessStatus(ApprovalStatusEnum.getValue(deviceAlarm.getProcessStatus())); @@ -180,10 +175,10 @@ } @Override - public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request, DataScope dataScope) { - List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, getDeptIds(request.getDeptId())); + public List batchExportDeviceAlarmHistoryList(AlarmRecordDTO request) { + List exportDTOList = this.baseMapper.batchExportDeviceAlarmHistoryList(request, commonServer.getDeptScopeIds(request.getDeptId())); exportDTOList.forEach(deviceAlarm -> { - deviceAlarm.setDeptName(getDeptNamesByDeptId(deviceAlarm.getDeptid())); + deviceAlarm.setDeptName(commonServer.getDeptNamesByDeptId(deviceAlarm.getDeptid())); deviceAlarm.setCancelDuration(TimeConverter(deviceAlarm.getCancelDuration())); deviceAlarm.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", deviceAlarm.getAlarmCategory())); deviceAlarm.setRealAlarm(DictEnum.REAL_ALARM.equals(deviceAlarm.getRealAlarm()) ? "是" : "否"); @@ -397,7 +392,7 @@ List> resultMapList = approvalLogMapper.getListByAlarmId(alarmId); resultMapList.forEach(map -> { map.put("process_name", ApprovalStatusEnum.getValue(map.get("FLOW_STATUS").toString())); - map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); + map.put("dept_name", ObjectUtil.isNotEmpty(map.get("DEPT_ID")) ? commonServer.getDeptNamesByDeptId(Long.valueOf(map.get("DEPT_ID").toString())) : ""); }); return resultMapList; } @@ -457,48 +452,19 @@ } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - /** * 导出记录-查询整个记录 * * @param request - * @param dataScope * @return */ @Override - public List allList(AlarmRecordDTO request, DataScope dataScope) { + public List allList(AlarmRecordDTO request) { - List alarmRecordExportDTOList = this.baseMapper.allList(request, dataScope, getDeptIds(request.getDeptId())); + List alarmRecordExportDTOList = this.baseMapper.allList(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setProcessStatus(ApprovalStatusEnum.getValue(alarmRecordExportDTO.getProcessStatus())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; @@ -506,12 +472,12 @@ @Override - public List batchExportHistory(AlarmRecordDTO request, DataScope dataScope) { - List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, dataScope, getDeptIds(request.getDeptId())); + public List batchExportHistory(AlarmRecordDTO request) { + List alarmRecordExportDTOList = this.baseMapper.batchExportHistory(request, commonServer.getDeptScopeIds(request.getDeptId())); alarmRecordExportDTOList.forEach(alarmRecordExportDTO -> { alarmRecordExportDTO.setRealAlarm(DictEnum.REAL_ALARM.equals(alarmRecordExportDTO.getRealAlarm()) ? "是" : "否"); alarmRecordExportDTO.setCancelDuration(TimeConverter(alarmRecordExportDTO.getCancelDuration())); - alarmRecordExportDTO.setDeptName(getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); + alarmRecordExportDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmRecordExportDTO.getDeptid())); alarmRecordExportDTO.setAlarmCategory(abstractDictService.getDictNameByCode("alarmCategory", alarmRecordExportDTO.getAlarmCategory())); }); return alarmRecordExportDTOList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java index a5b4e81..d96cfb8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmStaticsServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.alarm.dao.AlarmStaticsMapper; import com.casic.missiles.modular.alarm.dto.*; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IAlarmStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import com.casic.missiles.util.TimeConvertUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,21 +31,22 @@ public class AlarmStaticsServiceImpl extends ServiceImpl implements IAlarmStaticsService { private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public List overall(String alarmType) { //Todo:加入报警类型 - return this.baseMapper.overall(alarmType, getDeptIds(null)); + return this.baseMapper.overall(alarmType, commonServer.getDeptScopeIds(null)); } @Override public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { //Todo:加入报警类型 - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(null), request); + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptScopeIds(null), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } @@ -56,17 +54,19 @@ @Override public List alarmType(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - return this.baseMapper.alarmType(alarmType, getDeptIds(request.getDeptid()), request); + return this.baseMapper.alarmType(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override public List> alarmTrend(String alarmType, AlarmTypeRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } - List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, getDeptIds(request.getDeptid()), request); + List alarmTrendResponseDTOList = this.baseMapper.alarmTrend(alarmType, commonServer.getDeptScopeIds(request.getDeptid()), request); List alarmDeviceTypeDTOList = this.baseMapper.alarmTypeJoinList(); List> resultMapList = new ArrayList<>(); List days = new ArrayList<>(); @@ -96,21 +96,6 @@ return resultMapList; } - public String getDeptIds(Long deptId) { - List deptIds = new ArrayList<>(); - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIds = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds(); - } - } - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } public List getDeptList(String deptIdStrs) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -123,10 +108,11 @@ @Override public List> alarmCompany(String alarmType, AlarmPositionRequestDTO request) { if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setEndTime(request.getEndTime().replace("00:00:00", "23:59:59")); request.setTimeType(""); } List> resultMapList = new ArrayList<>(); - String deptIdStrs = getDeptIds(null); + String deptIdStrs = commonServer.getDeptScopeIds(null); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -170,14 +156,4 @@ return resultMapList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java index 8686f04..b55fe25 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java @@ -1,19 +1,16 @@ package com.casic.missiles.modular.alarm.service.impl; -import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.MessageLogMapper; import com.casic.missiles.modular.alarm.entity.MessageLog; import com.casic.missiles.modular.alarm.service.IMessageLogService; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -27,23 +24,15 @@ @Service public class MessageLogServiceImpl extends ServiceImpl implements IMessageLogService { - private final AbstractPermissionContext permissionContext; + + private final CommonServer commonServer; @Override public Page notePage(Page page) { - return this.baseMapper.notePage(page,getDeptIds()); + return this.baseMapper.notePage(page,commonServer.getDeptIds()); } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr =permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } + @Override public void removeByAlarmIds(List alarmIds) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java index e799c7a..6fad75a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java @@ -2,10 +2,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.alarm.dao.OverViewMapper; import com.casic.missiles.modular.alarm.dto.AlarmPositionRequestDTO; @@ -13,7 +11,7 @@ import com.casic.missiles.modular.alarm.dto.CommonResponseDTO; import com.casic.missiles.modular.alarm.entity.AlarmRecords; import com.casic.missiles.modular.alarm.service.IOverViewService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,47 +31,28 @@ public class OverViewServiceImpl extends ServiceImpl implements IOverViewService { private final AbstractPermissionContext permissionContext; - private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; @Override public List overall() { - return this.baseMapper.overall(getDeptIds()); + return this.baseMapper.overall(commonServer.getDeptIds()); } @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override - public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { - List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, getDeptIds(), request); + public List alarmPosition(String alarmType, AlarmPositionRequestDTO request) { + if (ObjectUtil.isNotEmpty(request.getBegTime()) || ObjectUtil.isNotEmpty(request.getEndTime())) { + request.setTimeType(""); + } + List alarmPositionResponseDTOList = this.baseMapper.alarmPosition(alarmType, commonServer.getDeptIds(), request); alarmPositionResponseDTOList.forEach(alarmPositionResponseDTO -> { alarmPositionResponseDTO.setType("1".equals(alarmPositionResponseDTO.getType()) ? "闸井" : ("2".equals(alarmPositionResponseDTO.getType()) ? "场站" : "管线")); - alarmPositionResponseDTO.setDeptName(getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); + alarmPositionResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(alarmPositionResponseDTO.getDeptid())); }); return alarmPositionResponseDTOList; } - - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr=permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - } 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 353f7c4..065319e 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 @@ -5,10 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.IdDTO; import com.casic.missiles.dto.IdsDTO; @@ -49,7 +47,6 @@ private final IBusDeviceService iBusDeviceService; - private final AbstractPermissionContext iCommonPermissionService; private final IBaseExportService iBaseExportService; @@ -57,9 +54,8 @@ @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, dataScope))); + return ReturnUtil.success(super.packForBT(iBusDeviceService.listPage(page, request))); } @ApiOperation("新增") @@ -188,7 +184,7 @@ Page page = PageFactory.defaultPage(); page.setSize(Integer.MAX_VALUE); - Page devicePage = iBusDeviceService.listPage(page, request, iCommonPermissionService.getAuthService().getLoginUserDataScope()); + Page devicePage = iBusDeviceService.listPage(page, request); 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/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java index 62dfa4d..477b23b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java @@ -3,9 +3,7 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; 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.ReturnDTO; @@ -38,24 +36,22 @@ public class BusLedgerController extends ExportController { private final IBusLedgerService iBusLedgerService; - private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("查询分页接口") @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageList(page, request))); } @ApiOperation("查询网格分页接口") @PostMapping("/grid/listPage") @ResponseBody public ReturnDTO listGridPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerService.pageGridList(page, request))); } @ApiOperation("添加标注") @@ -65,7 +61,7 @@ Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(iBusLedgerService.addRemark( request)); + return ReturnUtil.success(iBusLedgerService.addRemark(request)); } @ApiOperation("详情") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java index e44e0ee..b86572f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerPipeController.java @@ -46,9 +46,9 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerPipeRequestDTO busLedgerPipeRequestDTO) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.listPage(page, busLedgerPipeRequestDTO))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java index 1bdc6a0..f637877 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusPipeMonitorController.java @@ -39,7 +39,7 @@ public ReturnDTO listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorPipePageList(page, request))); } @ApiOperation("管线列表，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java index 8fc9b16..d9744be 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java @@ -40,9 +40,8 @@ @PostMapping("/listPage") @ResponseBody public ReturnDTO listPage(@RequestBody BusLedgerDTO request) { - DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); Page page = PageFactory.defaultPage(); - return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request, dataScope))); + return ReturnUtil.success(super.packForBT(wellMonitorService.pageList(page, request))); } @ApiOperation("查询接口，地图用") diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java index 340b4aa..da0910d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerMapper.java @@ -23,11 +23,11 @@ */ @Mapper public interface BusLedgerMapper extends BaseMapper { - Page pageList(@Param("scope") DataScope dataScope, Page page, + Page pageList( Page page, @Param("request") BusLedgerDTO request, @Param("deptStrs") String deptStrs); - Page pageGridList(@Param("scope") DataScope dataScope, Page page, @Param("request") BusLedgerDTO request); + Page pageGridList( Page page, @Param("request") BusLedgerDTO request,@Param("deptStrs") String deptStrs); @Select("SELECT id FROM bus_ledger_all_view WHERE tagNumber = #{tagNumber} and type= #{type} and deptid= #{deptid} ") List ledgerIdsByTagNumber(@Param("tagNumber") String tagNumber ,@Param("type") String type,@Param("deptid") Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml index 6d37e3a..04d53bb 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerMapper.xml @@ -86,6 +86,9 @@ and bg.LOCATION_STATE = #{request.locationState} + + and bg.DEPTID in (${deptStrs}) + ORDER BY bg.TS DESC 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 5b79134..cb9bc85 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,7 +2,6 @@ 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.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.entity.OffLineAnalysis; @@ -20,7 +19,7 @@ */ public interface IBusDeviceService extends IService { - Page listPage(Page page, BusDeviceDTO requestDTO, DataScope dataScope); + Page listPage(Page page, BusDeviceDTO requestDTO); boolean saveDevice(BusDevice busDevice); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java index 0159989..e047319 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java @@ -22,9 +22,9 @@ */ public interface IBusLedgerPipeService extends IService { - Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope); + Page listPage(Page page, BusLedgerPipeRequestDTO request); - Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope); + Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request); BusLedgerPipeResponseDTO detail(Long id,String devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java index 5f5f4f2..62fb1ed 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerService.java @@ -19,9 +19,9 @@ */ public interface IBusLedgerService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); - Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageGridList(Page page, BusLedgerDTO request); List ledgerIdsByTagNumber(String tagNumber,String type,Long deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java index 26efdf2..7595023 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusWellMonitorService.java @@ -22,7 +22,7 @@ */ public interface IBusWellMonitorService extends IService { - Page pageList(Page page, BusLedgerDTO request, DataScope dataScope); + Page pageList(Page page, BusLedgerDTO request); List list(BusLedgerDTO request, DataScope dataScope); 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 af079cc..2757a1f 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 @@ -14,13 +14,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.DeviceDataEnum; -import com.casic.missiles.enums.DictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.*; import com.casic.missiles.modular.device.service.*; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -53,6 +52,7 @@ private final IBusLedgerService iBusLedgerService; private final IBaseDeviceTypeService deviceTypeService; private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; @Transactional @Override @@ -76,15 +76,15 @@ @Override - public Page listPage(Page page, BusDeviceDTO request, DataScope dataScope) { - Page busDevicePage = this.baseMapper.pageList(page, request, getDeptScopeIds(request.getDeptId())); + public Page listPage(Page page, BusDeviceDTO request) { + Page busDevicePage = this.baseMapper.pageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busDeviceList = busDevicePage.getRecords(); busDeviceList.forEach(busDevice -> { busDevice.setWatchObject(abstractDictService.getDictNameByCode("watchObject", busDevice.getWatchObject())); busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid())); busDevice.setOnlineState("0".equals(busDevice.getOnlineState())?"离线":"在线"); if (ObjectUtil.isNotEmpty(busDevice.getDeptid())) - busDevice.setDeptName(getDeptNamesByDeptId(busDevice.getDeptid())); + busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid())); }); return busDevicePage; } @@ -278,33 +278,6 @@ return list; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java index 17d9b3a..505f798 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java @@ -1,19 +1,17 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDeptService; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DictEnum; import com.casic.missiles.modular.device.dao.BusDeviceStaticsMapper; import com.casic.missiles.modular.device.dto.*; import com.casic.missiles.modular.device.entity.BusDevice; import com.casic.missiles.modular.device.service.IBusDeviceStaticsService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,25 +32,26 @@ @Service public class BusDeviceStaticsServiceImpl extends ServiceImpl implements IBusDeviceStaticsService { - private final AbstractPermissionContext permissionContext; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; + @Override public List deviceStatus() { - return this.baseMapper.deviceStatus(getDeptIds()); + return this.baseMapper.deviceStatus(commonServer.getDeptIds()); } @Override public List deviceType() { - return this.baseMapper.deviceType(getDeptIds()); + return this.baseMapper.deviceType(commonServer.getDeptIds()); } @Override public List offLine() { - return this.baseMapper.offLine(getDeptIds()); + return this.baseMapper.offLine(commonServer.getDeptIds()); } @@ -67,7 +66,7 @@ @Override public List company() { List resultDTOList = new ArrayList<>(); - String deptIdStrs = getDeptIds(); + String deptIdStrs = commonServer.getDeptIds(); List deptIds = new ArrayList<>(); //根据权限只统计分公司级和工程组级 if (ObjectUtil.isNotEmpty(deptIdStrs)) { @@ -109,7 +108,7 @@ @Override public Page offLineList(OffLineRequestDTO requestDTO, Page page) { //toDo:其他预测类型需要补充 - Page responseDTOPage = this.baseMapper.offLineList(getDeptIds(), requestDTO, page); + Page responseDTOPage = this.baseMapper.offLineList(commonServer.getDeptIds(), requestDTO, page); List dtoList = responseDTOPage.getRecords(); dtoList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); @@ -120,10 +119,10 @@ @Override public List batchExportOffLineList(OffLineRequestDTO requestDTO) { - List exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO); + List exportDTOList = this.baseMapper.batchExportOffLineList(commonServer.getDeptIds(), requestDTO); exportDTOList.forEach(dto -> { dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他"); - dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):""); + dto.setDeptName(null != dto.getDeptid() ? commonServer.getDeptNamesByDeptId(dto.getDeptid()) : ""); }); return exportDTOList; } @@ -138,25 +137,4 @@ return resultDTOList; } - public String getDeptIds() { - String deptIdStr = ""; - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - deptIdStr = permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return deptIdStr; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java index a61f077..8663651 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java @@ -9,6 +9,8 @@ import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.enums.DeviceDataEnum; import com.casic.missiles.modular.device.dao.BusDeviceMapper; import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper; @@ -16,10 +18,9 @@ import com.casic.missiles.modular.device.dto.BusLedgerPipeRequestDTO; import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO; import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO; -import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.entity.BusLedgerPipe; import com.casic.missiles.modular.device.service.IBusLedgerPipeService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -40,18 +41,18 @@ @Service public class BusLedgerPipeServiceImpl extends ServiceImpl implements IBusLedgerPipeService { - private final AbstractDeptService abstractDeptService; private final AbstractPermissionContext permissionContext; private final AbstractDictService abstractDictService; private final BusDeviceMapper busDeviceMapper; + private final CommonServer commonServer; @Override - public Page listPage(Page page, BusLedgerPipeRequestDTO request, DataScope dataScope) { + public Page listPage(Page page, BusLedgerPipeRequestDTO request) { List deptIds = new ArrayList<>(); if (ObjectUtil.isNotEmpty(request.getDeptId())) { - deptIds = getDeptIds(request.getDeptId()); + deptIds = commonServer.getDeptIds(request.getDeptId()); } else { - deptIds = dataScope.getDeptIds(); + deptIds = getDeptids(); } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(ObjectUtil.isNotEmpty(request.getTagNumber()), "TAG_NUMBER", request.getTagNumber()); @@ -61,20 +62,20 @@ Page pipePage = this.page(page, queryWrapper); List pipeList = pipePage.getRecords(); pipeList.forEach(pipe -> { - pipe.setDeptName(getDeptNamesByDeptId(pipe.getDeptid())); + pipe.setDeptName(commonServer.getDeptNamesByDeptId(pipe.getDeptid())); }); return pipePage; } @Override - public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request, DataScope dataScope) { + public Page monitorPipePageList(Page page, BusLedgerPipeMonitorRequestDTO request) { - Page pageList = this.baseMapper.monitorPipePageList(page, request, getDeptScopeIds(request.getDeptId())); + Page pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setOnState(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 管理单位名称 busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值 busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 }); @@ -87,7 +88,7 @@ if (null != busLedgerPipeResponseDTO) { busLedgerPipeResponseDTO.setStatus("1".equals(busLedgerPipeResponseDTO.getStatus()) ? "正常" : "异常"); busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值 - busLedgerPipeResponseDTO.setDeptName(getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 + busLedgerPipeResponseDTO.setDeptName(commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid())); // 管理单位名称 busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值 busLedgerPipeResponseDTO.setManageType(abstractDictService.getDictNameByCode("manageType", busLedgerPipeResponseDTO.getManageType())); // 位置状态字典值 } @@ -120,44 +121,17 @@ @Override public List> deviceList() { - return this.baseMapper.deviceList(getDeptScopeIds(null)); + return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null)); } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public List getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds; + public List getDeptids() { + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope(); } return null; } - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java index d9a0a25..7feeb89 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerServiceImpl.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDeptService; @@ -15,12 +12,12 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -36,22 +33,23 @@ private final AbstractDictService abstractDictService; private final AbstractDeptService abstractDeptService; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(dataScope, page, request,getDeptIds(request.getDeptid())); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 busLedger.setOnStateName(abstractDictService.getDictNameByCode("onState", busLedger.getOnState())); // 使用状态字典值 // busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); }); return pageList; } - public Page pageGridList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageGridList = this.baseMapper.pageGridList(dataScope, page, request); + public Page pageGridList(Page page, BusLedgerDTO request) { + Page pageGridList = this.baseMapper.pageGridList( page, request,commonServer.getDeptScopeIds(request.getDeptid())); List busGridList = pageGridList.getRecords(); busGridList.forEach(busGrid -> { busGrid.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busGrid.getLocationState())); @@ -59,16 +57,7 @@ return pageGridList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } + @Override public boolean addRemark(BusLedgerDTO request) { @@ -84,15 +73,6 @@ } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } @Override diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java index a48fde4..2571222 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusPipelineServiceImpl.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +14,7 @@ import com.casic.missiles.modular.device.dto.BusPipelineRequestDTO; import com.casic.missiles.modular.device.entity.BusPipeline; import com.casic.missiles.modular.device.service.IBusPipelineService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -45,12 +43,14 @@ final private AbstractDictService abstractDictService; + final private CommonServer commonServer; + @Override public Page listPage(Page page, BusPipelineRequestDTO requestDTO) { DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); - Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, getDeptIds(requestDTO.getDeptid())); + Page pipelinePage = this.baseMapper.listPage(dataScope, page, requestDTO, commonServer.getDeptScopeIds(requestDTO.getDeptid())); List busPipelineList = pipelinePage.getRecords(); @@ -60,33 +60,13 @@ busPipeline.setPressTypeName(abstractDictService.getDictNameByCode("wellType", busPipeline.getPressType())); - busPipeline.setDeptName(getDeptNamesByDeptId(busPipeline.getDeptid())); + busPipeline.setDeptName(commonServer.getDeptNamesByDeptId(busPipeline.getDeptid())); }); return pipelinePage; } - public String getDeptIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - return ""; - } - - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - @Transactional @Override @@ -115,7 +95,7 @@ List busPipelineList = new ArrayList<>(); for (BusPipelineImportDTO importDTO : results) { BusPipeline busPipeline = new BusPipeline(); - BeanUtils.copyProperties(importDTO,busPipeline ); + BeanUtils.copyProperties(importDTO, busPipeline); busPipeline.setManageType(PipeInfoEnum.getValue(importDTO.getManageType())); busPipeline.setPressType(PipeInfoEnum.getValue(importDTO.getPressType())); busPipelineList.add(busPipeline); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java index 587ea1e..bf968ef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java @@ -1,12 +1,7 @@ package com.casic.missiles.modular.device.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.enums.DeviceDataEnum; @@ -19,7 +14,7 @@ import com.casic.missiles.modular.device.entity.BusLedger; import com.casic.missiles.modular.device.service.IBusLedgerService; import com.casic.missiles.modular.device.service.IBusWellMonitorService; -import com.casic.missiles.modular.system.model.Dept; +import com.casic.missiles.server.CommonServer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -44,12 +39,11 @@ private final AbstractDictService abstractDictService; private final IBusLedgerService iBusLedgerService; - private final AbstractDeptService abstractDeptService; - private final AbstractPermissionContext permissionContext; + private final CommonServer commonServer; - public Page pageList(Page page, BusLedgerDTO request, DataScope dataScope) { - Page pageList = this.baseMapper.pageList(getDeptScopeIds(request.getDeptid()), page, request); + public Page pageList(Page page, BusLedgerDTO request) { + Page pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request); List busLedgerList = pageList.getRecords(); busLedgerList.forEach(busLedger -> { busLedger.setManageTypeName(abstractDictService.getDictNameByCode("manageType", busLedger.getManageType())); // 管理方式字典值 @@ -57,7 +51,7 @@ busLedger.setWellTypeName(abstractDictService.getDictNameByCode("wellType", busLedger.getWellType())); // 井类型字典值 busLedger.setLocationStateName(abstractDictService.getDictNameByCode("locationState", busLedger.getLocationState())); // 位置状态字典值 busLedger.setMonitorStateName(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值 - busLedger.setDeptName(getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 + busLedger.setDeptName(commonServer.getDeptNamesByDeptId(busLedger.getDeptid())); // 监控状态字典值 }); return pageList; } @@ -67,7 +61,7 @@ public List list(BusLedgerDTO request, DataScope dataScope) { // 地图不分页接口不再查字典值了 // 直接返回 - return this.baseMapper.list(getDeptScopeIds(request.getDeptid()), request); + return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request); } @Override @@ -111,32 +105,4 @@ return lifeCycleRecordDTOList; } - public String getDeptNamesByDeptId(Long deptId) { - List deptIds = abstractDeptService.getParentListById(deptId); - deptIds.add(deptId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", deptIds); - queryWrapper.orderByAsc("pids"); - List deptList = abstractDeptService.list(queryWrapper); - List nameList = deptList.stream().filter(dept->ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); - return String.join("/", nameList); - } - - public String getDeptScopeIds(Long deptId) { - if (ObjectUtil.isNotEmpty(deptId)) { - //获取子级单位 - List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); - deptIds.add(deptId); - return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } else { - //获取登录权限 - DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); - if (!"ALL_TYPE".equals(dataScope.getScopeEnums().name())) { - return permissionContext.getAuthService().getLoginUserDataScope().getDeptIds() - .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); - } - } - return ""; - } - } diff --git a/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java new file mode 100644 index 0000000..3f33ca1 --- /dev/null +++ b/casic-public/src/main/java/com/casic/missiles/server/CommonServer.java @@ -0,0 +1,87 @@ +package com.casic.missiles.server; + + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDeptService; +import com.casic.missiles.core.datascope.ScopeEnums; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.modular.system.model.Dept; +import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@RequiredArgsConstructor +@Service +public class CommonServer { + + private final AbstractDeptService abstractDeptService; + private final AbstractPermissionContext permissionContext; + + @Cacheable(value = "deptNameCache", key = "#deptId") + public String getDeptNamesByDeptId(Long deptId) { + List deptIds = abstractDeptService.getParentListById(deptId); + deptIds.add(deptId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", deptIds); + queryWrapper.orderByAsc("pids"); + List deptList = abstractDeptService.list(queryWrapper); + List nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList()); + return String.join("/", nameList); + } + + // @Cacheable(value = "deptIdsCache") + public String getDeptIds() { + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + + public List getDeptIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds; + } + return null; + } + + public String getDeptIdStrs(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + + @Cacheable(value = "deptScopeIdsCache", key = "#authUser.getId()") + public String getDeptIds(AuthUser authUser) { + String scopeType = authUser.getScopeType(); + if (!ScopeEnums.ALL_TYPE.getCode().equals(scopeType)) { + return authUser.getDataScope() + .stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } + return ""; + } + + //todo:账户加缓存 + public String getDeptScopeIds(Long deptId) { + if (ObjectUtil.isNotEmpty(deptId)) { + //获取子级单位 + List deptIds = abstractDeptService.getIdsRecursionByPid(deptId, ""); + deptIds.add(deptId); + return deptIds.stream().map(id -> Convert.toStr(id)).collect(Collectors.joining(",")); + } else { + //获取登录权限 + return getDeptIds(permissionContext.getAuthService().getLoginUser()); + } + } + +} diff --git a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java index 51e06ec..71a84d0 100644 --- a/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java +++ b/casic-public/src/main/java/com/casic/missiles/util/TimeConvertUtil.java @@ -49,8 +49,7 @@ DateTime dateTime1= DateUtil.parseDateTime(begTime); DateTime dateTime2= DateUtil.parseDateTime(endTime); int betweenDay = (int) ((dateTime2.getTime() - dateTime1.getTime()) / (1000 * 60 * 60 * 24)); - betweenDays.add(DateUtil.beginOfMonth(new Date()).toString("yyyy-MM-dd")); - for(int i=1;i<=betweenDay;i++){ + for(int i=0;i<=betweenDay;i++){ betweenDays.add(DateUtil.offsetDay(dateTime1,i).toString("yyyy-MM-dd")); } return betweenDays; diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml new file mode 100644 index 0000000..88b148f --- /dev/null +++ b/casic-web/src/main/resources/ehcache.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +