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 0a0b7f3..e1dd314 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 @@ -104,7 +104,7 @@ ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); try { - List> res = statisticsService.deviceStaticsByStatus(dataScope); + Map res = statisticsService.deviceStaticsByStatus(dataScope); responseData.setData(res); responseData.setCode(200); responseData.setMessage("查询成功"); 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 0a0b7f3..e1dd314 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 @@ -104,7 +104,7 @@ ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); try { - List> res = statisticsService.deviceStaticsByStatus(dataScope); + Map res = statisticsService.deviceStaticsByStatus(dataScope); responseData.setData(res); responseData.setCode(200); responseData.setMessage("查询成功"); 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 30ad198..fbc3a8d 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); - List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + Map deviceStaticsByStatus(@Param("deptIds") String deptIds); List> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds); 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 0a0b7f3..e1dd314 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 @@ -104,7 +104,7 @@ ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); try { - List> res = statisticsService.deviceStaticsByStatus(dataScope); + Map res = statisticsService.deviceStaticsByStatus(dataScope); responseData.setData(res); responseData.setCode(200); responseData.setMessage("查询成功"); 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 30ad198..fbc3a8d 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); - List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + Map deviceStaticsByStatus(@Param("deptIds") String deptIds); List> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds); 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 24e53d1..9d25549 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(DataScope dataScope, String deviceType); - List> deviceStaticsByStatus(DataScope dataScope); + Map deviceStaticsByStatus(DataScope dataScope); List> deviceStaticsByStatusAndType(DataScope dataScope); 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 0a0b7f3..e1dd314 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 @@ -104,7 +104,7 @@ ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); try { - List> res = statisticsService.deviceStaticsByStatus(dataScope); + Map res = statisticsService.deviceStaticsByStatus(dataScope); responseData.setData(res); responseData.setCode(200); responseData.setMessage("查询成功"); 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 30ad198..fbc3a8d 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); - List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + Map deviceStaticsByStatus(@Param("deptIds") String deptIds); List> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds); 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 24e53d1..9d25549 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(DataScope dataScope, String deviceType); - List> deviceStaticsByStatus(DataScope dataScope); + Map deviceStaticsByStatus(DataScope dataScope); List> deviceStaticsByStatusAndType(DataScope dataScope); 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 9be7fba..68c2cab 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 @@ -70,9 +70,9 @@ } @Override - public List> deviceStaticsByStatus(DataScope dataScope) { + public Map deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + Map mapList = statisticMapper.deviceStaticsByStatus(deptIds); return mapList; } 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 0a0b7f3..e1dd314 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 @@ -104,7 +104,7 @@ ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); try { - List> res = statisticsService.deviceStaticsByStatus(dataScope); + Map res = statisticsService.deviceStaticsByStatus(dataScope); responseData.setData(res); responseData.setCode(200); responseData.setMessage("查询成功"); 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 30ad198..fbc3a8d 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); - List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + Map deviceStaticsByStatus(@Param("deptIds") String deptIds); List> deviceStaticsByStatusAndType(@Param("deptIds") String deptIds); 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 24e53d1..9d25549 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 @@ -15,7 +15,7 @@ List> deviceStaticsByDept(DataScope dataScope, String deviceType); - List> deviceStaticsByStatus(DataScope dataScope); + Map deviceStaticsByStatus(DataScope dataScope); List> deviceStaticsByStatusAndType(DataScope dataScope); 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 9be7fba..68c2cab 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 @@ -70,9 +70,9 @@ } @Override - public List> deviceStaticsByStatus(DataScope dataScope) { + public Map deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + Map mapList = statisticMapper.deviceStaticsByStatus(deptIds); return mapList; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java index 5810303..cf25d72 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java @@ -44,7 +44,6 @@ private String deviceType; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("部门编号") private String deptid; @ExcelProperty("部门名称") private String deptName;