diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 49681d5..3245bcb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -829,7 +829,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS "liquidSwitch", diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 49681d5..3245bcb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -829,7 +829,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS "liquidSwitch", diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index e2104a4..417d274 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -24,7 +24,7 @@ List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List getDeviceList(@Param("scope") DataScope dataScope); + List getDeviceListInfo(@Param("scope") DataScope dataScope); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 49681d5..3245bcb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -829,7 +829,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS "liquidSwitch", diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index e2104a4..417d274 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -24,7 +24,7 @@ List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List getDeviceList(@Param("scope") DataScope dataScope); + List getDeviceListInfo(@Param("scope") DataScope dataScope); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 920518a..da250a4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -183,7 +183,7 @@ ORDER BY INSTALLDATE DESC - SELECT id, devcode, deviceName, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 49681d5..3245bcb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -829,7 +829,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS "liquidSwitch", diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index e2104a4..417d274 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -24,7 +24,7 @@ List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List getDeviceList(@Param("scope") DataScope dataScope); + List getDeviceListInfo(@Param("scope") DataScope dataScope); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 920518a..da250a4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -183,7 +183,7 @@ ORDER BY INSTALLDATE DESC - SELECT id, devcode, deviceName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 77d3da6..4a78066 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -388,7 +388,7 @@ @Override public List getDeviceList(DataScope dataScope) { - return this.baseMapper.getDeviceList(dataScope); + return this.baseMapper.getDeviceListInfo(dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 528b2fb..e7e1fae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -446,7 +446,6 @@ @ResponseBody public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { - AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); // String dbTime = iSysDictService.getDBtime(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 56caa96..1e81d70 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -203,8 +203,7 @@ @RequestMapping("/alarmStaticsByContent") @ResponseBody public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmCountByType( beginTime, endTime, alarmType); } /** @@ -213,8 +212,7 @@ @RequestMapping("/alarmStaticsByStatus") @ResponseBody public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return statisticsService.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); + return statisticsService.getAlarmByStatus(beginTime, endTime, alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index fbc3a8d..cfe58f5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -11,7 +11,9 @@ List> wellStaticsByType(@Param("deptIds") String deptIds); - List> deviceStaticsByType(@Param("deptIds") String deptIds); + String getDeviceType(@Param("deptid")Long deptId); + + List> deviceStaticsByType(); List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); @@ -28,9 +30,9 @@ List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); - List> getAlarmCountByType(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + List> getAlarmCountByType( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType); - List> getAlarmByStatus(@Param("dataScope") DataScope dataScope,@Param("beginTime") String beginTime, + List> getAlarmByStatus(@Param("beginTime") String beginTime, @Param("endTime") String endTime,@Param("alarmType") String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index df31d87..171c917 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -30,21 +30,21 @@ + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 9d25549..f46e427 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -25,9 +25,9 @@ Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent); - Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmCountByType( String beginTime, String endTime, String alarmType); - Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType); + Object getAlarmByStatus( String beginTime, String endTime, String alarmType); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 0c7d723..21b0436 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -53,13 +54,13 @@ @Override public List> deviceStaticsByType(DataScope dataScope) { - String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByType(deptIds); - -// for (Map map : mapList) { -// map.replace("deviceType",sysDictMapper.getDeviceTypeNameById(map.get("deviceType").toString())); -// } - return mapList; + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); + List> mapList = statisticMapper.deviceStaticsByType(); + List> dataScopeFilter= mapList.stream().filter( + map->detypeTypes.contains(map.get("id").toString()) + ).collect(Collectors.toList()); + return dataScopeFilter; } @Override @@ -162,16 +163,18 @@ return responseData; } - public Object getAlarmCountByType(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmCountByType(String beginTime, String endTime, String alarmType) { + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); ResponseData responseData = new ResponseData(); try { - List> alarmWellList = statisticMapper.getAlarmCountByType(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString()))) - ); + List> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); @@ -180,16 +183,18 @@ return responseData; } - public Object getAlarmByStatus(DataScope dataScope, String beginTime, String endTime, String alarmType) { + public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) { ResponseData responseData = new ResponseData(); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); + String detypeTypes= statisticMapper.getDeviceType(deptId); try { - List> alarmWellList = statisticMapper.getAlarmByStatus(dataScope, beginTime, endTime, alarmType); - alarmWellList.forEach( - alarmWell->alarmWell.put("cancelAlarm",Integer.valueOf(alarmWell.get("totalAlarm").toString())-Integer.valueOf(alarmWell.get("alarmings").toString())) - ); + List> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType); + List> dataScopeFilter= alarmWellList.stream().filter( + map->detypeTypes.contains(map.get("deviceType").toString()) + ).collect(Collectors.toList()); responseData.setCode(200); responseData.setMessage("查询成功"); - responseData.setData(alarmWellList); + responseData.setData(dataScopeFilter); } catch (DataAccessException ex) { log.error("主题：报警井查询出现异常，异常信息{}", ex); responseData.setCode(500); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index f11ceb6..14b9719 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -45,11 +45,11 @@ Page page = PageFactory.defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(wellCoverDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -73,12 +73,11 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellCoverDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); + super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName()); } /** @@ -100,11 +99,11 @@ } //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(list); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -128,34 +127,36 @@ page.setSize(Integer.MAX_VALUE); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - - list.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); + super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName()); } @GetMapping(value = "/gasdata/list-page") - //@Permission + @Permission public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - deviceDataExcelDtoList.forEach(deviceDto -> { + List deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); - page.setRecords(deviceDataExcelDtoList); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @GetMapping(value = "/tubedata/list-page") - //@Permission + @Permission public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + deviceDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -171,7 +172,7 @@ * @throws IOException */ @GetMapping(value = "/tubedata/export") - //@Permission + @Permission public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -181,7 +182,6 @@ DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - tubeDatalist.forEach(deviceDto -> { deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); }); @@ -199,7 +199,6 @@ * @throws IOException */ @GetMapping(value = "/gasdata/export") - public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException { Page page = PageFactory.defaultPage(); page.setCurrent(1); @@ -228,8 +227,11 @@ public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + harmfulDataDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(harmfulDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -251,8 +253,8 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - harmfulDataDtoList.forEach(deviceDto -> { - deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + harmfulDataDtoList.forEach(harmfulDataDto -> { + harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid())); }); //TODO 导出表头设置 super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -272,6 +274,9 @@ Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + mapList.forEach(temhumDataDto -> { + temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid())); + }); page.setRecords(mapList); return ResponseData.success(super.packForBT(page)); } @@ -290,8 +295,11 @@ public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + temppressDataDtoList.forEach(temppressDataDto -> { + temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid())); + }); + page.setRecords(temppressDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -362,8 +370,11 @@ public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -383,7 +394,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -406,8 +416,11 @@ public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + wellAppointDataDtoList.forEach(wellAppointDataDto -> { + wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid())); + }); + page.setRecords(wellAppointDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -427,7 +440,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); wellAppointDataDtoList.forEach(deviceDto -> { @@ -450,8 +462,11 @@ public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + digNoiseDataDtoList.forEach(digNoiseDataDto -> { + digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid())); + }); + page.setRecords(digNoiseDataDtoList); return ResponseData.success(super.packForBT(page)); } @@ -471,7 +486,6 @@ page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); digNoiseDataDtoList.forEach(deviceDto -> { @@ -515,8 +529,12 @@ public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); - page.setRecords(mapList); + List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); + + deviceDataExcelDtoList.forEach(deviceDto -> { + deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid())); + }); + page.setRecords(deviceDataExcelDtoList); return ResponseData.success(super.packForBT(page)); } @@ -572,6 +590,9 @@ } DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime); + mapList.forEach(deviceDto -> { + deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString())); + }); return ResponseData.success(mapList); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java index b15381c..9661388 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java @@ -35,7 +35,7 @@ /** * 第三方燃气列表 */ - @RequestMapping("/gasdector/listpage") + @RequestMapping("/gasdector/list-page") public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); @@ -62,7 +62,7 @@ /** * 第三方甲烷列表 */ - @RequestMapping("/pantilt/listpage") + @RequestMapping("/pantilt/list-page") public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) { Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 49681d5..3245bcb 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -829,7 +829,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS "liquidSwitch", diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index e2104a4..417d274 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -24,7 +24,7 @@ List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List getDeviceList(@Param("scope") DataScope dataScope); + List getDeviceListInfo(@Param("scope") DataScope dataScope); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 920518a..da250a4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -183,7 +183,7 @@ ORDER BY INSTALLDATE DESC - SELECT id, devcode, deviceName, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 77d3da6..4a78066 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -388,7 +388,7 @@ @Override public List getDeviceList(DataScope dataScope) { - return this.baseMapper.getDeviceList(dataScope); + return this.baseMapper.getDeviceListInfo(dataScope); } @Override diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 67c0b9b..854447b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -48,7 +48,7 @@ @JSONField(name="H2S") private String H2S; @ExcelProperty("液位开关") - private String switchStart; + private String liquidSwitch; @ExcelProperty("采集时间") private String uptime; @ExcelProperty("记录时间")