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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,beginTime,endTime,alarmType); + } + 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @Param("endTime") String endTime, @Param("alarmType") String alarmType); } 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ No newline at end of file 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,String beginTime,String endTime,String alarmType); } 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,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 4be538f..2655288 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 @@ -152,4 +152,22 @@ } return responseData; } + + public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,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 4be538f..2655288 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 @@ -152,4 +152,22 @@ } return responseData; } + + public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } 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 ff3be2e..7eed6c3 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 @@ -278,7 +278,7 @@ /** - * 温湿度数据查询 + * 温湿度压力数据查询 * * @param keywords * @param deptid 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,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 4be538f..2655288 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 @@ -152,4 +152,22 @@ } return responseData; } + + public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } 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 ff3be2e..7eed6c3 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 @@ -278,7 +278,7 @@ /** - * 温湿度数据查询 + * 温湿度压力数据查询 * * @param keywords * @param deptid diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java new file mode 100644 index 0000000..5d71e35 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java @@ -0,0 +1,140 @@ +package com.casic.missiles.modular.system.controller; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.IDeptPermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 组织业务支持配置控制器 + * + * @author dev + * @Date 2019-05-28 15:08:56 + */ +@Controller +@RequestMapping("/config") +public class DeptConfigController extends BaseController { + + @Autowired + private IDeptPermissionService deptPermissionService; + @Resource + private AbstractPermissionContext service; + + /** + * 获取组织业务支持配置列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return deptPermissionService.list(null); + } + + /** + * 获取组织业务支持配置分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = PageFactory.defaultPage(); + ; + QueryWrapper query = new QueryWrapper<>(); + page = deptPermissionService.page(page, query); + return super.packForBT(page); + } + + /** + * 新增组织业务支持配置 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(DeptPermission deptPermission) { + deptPermissionService.save(deptPermission); + return ResponseData.success(); + } + + /** + * 删除组织业务支持配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String deptPermissionId) { + deptPermissionService.removeById(deptPermissionId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("deptPermissionIds") List deptPermissionIds) { + deptPermissionService.removeByIds(deptPermissionIds); + return ResponseData.success(); + } + + /** + * 修改组织业务支持配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DeptPermission deptPermission) { + deptPermissionService.updateById(deptPermission); + return ResponseData.success(); + } + + @GetMapping(value = "/getAuthorByDept") + @ResponseBody + public Object getAuthorByDept() { + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + + //递归查询组织相关配置数据 + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId()); + if (deptPermission != null) { + deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); + deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); + deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); + } + resultData.setData(deptPermission); + return resultData; + } + + + @GetMapping(value = "/getAreaByDept") + @ResponseBody + public Object getAreaByDept(Long deptId) { + if (deptId == null) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + //递归查询组织相关配置数据 + resultData.setData(deptPermissionService.selectDeptPermission(deptId)); + return resultData; + } + + /** + * 组织业务支持配置详情 + */ + @RequestMapping(value = "/detail/{deptPermissionId}") + @ResponseBody + public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) { + return ResponseData.success(deptPermissionService.getById(deptPermissionId)); + } +} 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,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 4be538f..2655288 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 @@ -152,4 +152,22 @@ } return responseData; } + + public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } 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 ff3be2e..7eed6c3 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 @@ -278,7 +278,7 @@ /** - * 温湿度数据查询 + * 温湿度压力数据查询 * * @param keywords * @param deptid diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java new file mode 100644 index 0000000..5d71e35 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java @@ -0,0 +1,140 @@ +package com.casic.missiles.modular.system.controller; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.IDeptPermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 组织业务支持配置控制器 + * + * @author dev + * @Date 2019-05-28 15:08:56 + */ +@Controller +@RequestMapping("/config") +public class DeptConfigController extends BaseController { + + @Autowired + private IDeptPermissionService deptPermissionService; + @Resource + private AbstractPermissionContext service; + + /** + * 获取组织业务支持配置列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return deptPermissionService.list(null); + } + + /** + * 获取组织业务支持配置分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = PageFactory.defaultPage(); + ; + QueryWrapper query = new QueryWrapper<>(); + page = deptPermissionService.page(page, query); + return super.packForBT(page); + } + + /** + * 新增组织业务支持配置 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(DeptPermission deptPermission) { + deptPermissionService.save(deptPermission); + return ResponseData.success(); + } + + /** + * 删除组织业务支持配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String deptPermissionId) { + deptPermissionService.removeById(deptPermissionId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("deptPermissionIds") List deptPermissionIds) { + deptPermissionService.removeByIds(deptPermissionIds); + return ResponseData.success(); + } + + /** + * 修改组织业务支持配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DeptPermission deptPermission) { + deptPermissionService.updateById(deptPermission); + return ResponseData.success(); + } + + @GetMapping(value = "/getAuthorByDept") + @ResponseBody + public Object getAuthorByDept() { + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + + //递归查询组织相关配置数据 + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId()); + if (deptPermission != null) { + deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); + deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); + deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); + } + resultData.setData(deptPermission); + return resultData; + } + + + @GetMapping(value = "/getAreaByDept") + @ResponseBody + public Object getAreaByDept(Long deptId) { + if (deptId == null) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + //递归查询组织相关配置数据 + resultData.setData(deptPermissionService.selectDeptPermission(deptId)); + return resultData; + } + + /** + * 组织业务支持配置详情 + */ + @RequestMapping(value = "/detail/{deptPermissionId}") + @ResponseBody + public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) { + return ResponseData.success(deptPermissionService.getById(deptPermissionId)); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java deleted file mode 100644 index a769652..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 组织业务支持配置控制器 - * - * @author dev - * @Date 2019-05-28 15:08:56 - */ -@Controller -@RequestMapping("/config") -public class DeptPermissionController extends BaseController { - - - @Autowired - private IDeptPermissionService deptPermissionService; - @Resource - private AbstractPermissionContext service; - - /** - * 获取组织业务支持配置列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return deptPermissionService.list(null); - } - - /** - * 获取组织业务支持配置分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage(); - ; - QueryWrapper query = new QueryWrapper<>(); - page = deptPermissionService.page(page, query); - return super.packForBT(page); - } - - /** - * 新增组织业务支持配置 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(DeptPermission deptPermission) { - deptPermissionService.save(deptPermission); - return ResponseData.success(); - } - - /** - * 删除组织业务支持配置 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String deptPermissionId) { - deptPermissionService.removeById(deptPermissionId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("deptPermissionIds") List deptPermissionIds) { - deptPermissionService.removeByIds(deptPermissionIds); - return ResponseData.success(); - } - - /** - * 修改组织业务支持配置 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(DeptPermission deptPermission) { - deptPermissionService.updateById(deptPermission); - return ResponseData.success(); - } - - @GetMapping(value = "/getAuthorByDept") - @ResponseBody - public Object getAuthorByDept() { - SuccessResponseData resultData = new SuccessResponseData(); - resultData.setCode(200); - resultData.setMessage("查询详情成功"); - - //递归查询组织相关配置数据 - DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId()); - if (deptPermission != null) { - deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); - deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); - deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); - } - resultData.setData(deptPermission); - return resultData; - } - - - @GetMapping(value = "/getAreaByDept") - @ResponseBody - public Object getAreaByDept(Long deptId) { - if (deptId == null) { - throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); - } - SuccessResponseData resultData = new SuccessResponseData(); - resultData.setCode(200); - resultData.setMessage("查询详情成功"); - //递归查询组织相关配置数据 - resultData.setData(deptPermissionService.selectDeptPermission(deptId)); - return resultData; - } - - /** - * 组织业务支持配置详情 - */ - @RequestMapping(value = "/detail/{deptPermissionId}") - @ResponseBody - public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) { - return ResponseData.success(deptPermissionService.getById(deptPermissionId)); - } -} 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 7814f7e..a6220bd 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 @@ -180,6 +180,20 @@ return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmType + * @return + */ + @RequestMapping("/alarmtype/count") + @ResponseBody + public Object getAlarmCountBytype(String beginTime, String endTime,String alarmType) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.getAlarmCountBytype(dataScope,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 573f5e7..aecc489 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 @@ -24,4 +24,7 @@ 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, + @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 e5571df..4cf43f0 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 @@ -109,6 +109,7 @@ + and datediff(now(),aj.create_time) < ${paramDay} @@ -117,6 +118,7 @@ + ]]> @@ -127,12 +129,14 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -141,10 +145,12 @@ + and date_part(now(),aj.create_time) < ${paramDay} + ]]> @@ -258,12 +264,12 @@ - + SELECT ar.WELL_CODE AS "wellCode",COUNT(1) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, + COUNT(DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode" + FROM alarm_records ar + LEFT JOIN bus_well_info bwi ON bwi.Well_code=ar.WELL_CODE WHERE ar.WELL_CODE is not null and ar.WELL_CODE != '' AND ALARM_CONTENT = #{alarmContent} @@ -275,7 +281,7 @@ - AND ALARM_TIME + AND ALARM_TIME @@ -284,4 +290,28 @@ ORDER BY alarmCount DESC + + \ 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 ba78a63..0b5e37d 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 @@ -22,4 +22,6 @@ List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); + + Object getAlarmCountBytype(DataScope dataScope,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 4be538f..2655288 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 @@ -152,4 +152,22 @@ } return responseData; } + + public Object getAlarmCountBytype(DataScope dataScope, String beginTime, String endTime, String alarmType) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.getAlarmCountBytype(dataScope, beginTime, endTime, alarmType); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } 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 ff3be2e..7eed6c3 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 @@ -278,7 +278,7 @@ /** - * 温湿度数据查询 + * 温湿度压力数据查询 * * @param keywords * @param deptid diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java new file mode 100644 index 0000000..5d71e35 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java @@ -0,0 +1,140 @@ +package com.casic.missiles.modular.system.controller; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.IDeptPermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 组织业务支持配置控制器 + * + * @author dev + * @Date 2019-05-28 15:08:56 + */ +@Controller +@RequestMapping("/config") +public class DeptConfigController extends BaseController { + + @Autowired + private IDeptPermissionService deptPermissionService; + @Resource + private AbstractPermissionContext service; + + /** + * 获取组织业务支持配置列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return deptPermissionService.list(null); + } + + /** + * 获取组织业务支持配置分页列表 + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = PageFactory.defaultPage(); + ; + QueryWrapper query = new QueryWrapper<>(); + page = deptPermissionService.page(page, query); + return super.packForBT(page); + } + + /** + * 新增组织业务支持配置 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(DeptPermission deptPermission) { + deptPermissionService.save(deptPermission); + return ResponseData.success(); + } + + /** + * 删除组织业务支持配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String deptPermissionId) { + deptPermissionService.removeById(deptPermissionId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("deptPermissionIds") List deptPermissionIds) { + deptPermissionService.removeByIds(deptPermissionIds); + return ResponseData.success(); + } + + /** + * 修改组织业务支持配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DeptPermission deptPermission) { + deptPermissionService.updateById(deptPermission); + return ResponseData.success(); + } + + @GetMapping(value = "/getAuthorByDept") + @ResponseBody + public Object getAuthorByDept() { + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + + //递归查询组织相关配置数据 + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId()); + if (deptPermission != null) { + deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); + deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); + deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); + } + resultData.setData(deptPermission); + return resultData; + } + + + @GetMapping(value = "/getAreaByDept") + @ResponseBody + public Object getAreaByDept(Long deptId) { + if (deptId == null) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + SuccessResponseData resultData = new SuccessResponseData(); + resultData.setCode(200); + resultData.setMessage("查询详情成功"); + //递归查询组织相关配置数据 + resultData.setData(deptPermissionService.selectDeptPermission(deptId)); + return resultData; + } + + /** + * 组织业务支持配置详情 + */ + @RequestMapping(value = "/detail/{deptPermissionId}") + @ResponseBody + public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) { + return ResponseData.success(deptPermissionService.getById(deptPermissionId)); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java deleted file mode 100644 index a769652..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.casic.missiles.modular.system.controller; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.base.controller.BaseController; -import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 组织业务支持配置控制器 - * - * @author dev - * @Date 2019-05-28 15:08:56 - */ -@Controller -@RequestMapping("/config") -public class DeptPermissionController extends BaseController { - - - @Autowired - private IDeptPermissionService deptPermissionService; - @Resource - private AbstractPermissionContext service; - - /** - * 获取组织业务支持配置列表 - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list(String condition) { - return deptPermissionService.list(null); - } - - /** - * 获取组织业务支持配置分页列表 - */ - @RequestMapping(value = "/listPage") - @ResponseBody - public Object listPage(String condition) { - Page page = PageFactory.defaultPage(); - ; - QueryWrapper query = new QueryWrapper<>(); - page = deptPermissionService.page(page, query); - return super.packForBT(page); - } - - /** - * 新增组织业务支持配置 - */ - @RequestMapping(value = "/add") - @ResponseBody - public Object add(DeptPermission deptPermission) { - deptPermissionService.save(deptPermission); - return ResponseData.success(); - } - - /** - * 删除组织业务支持配置 - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete(@RequestParam String deptPermissionId) { - deptPermissionService.removeById(deptPermissionId); - return ResponseData.success(); - } - - /** - * 批量删除 - */ - @RequestMapping(value = "/batchDelete") - @ResponseBody - public Object delete(@RequestParam("deptPermissionIds") List deptPermissionIds) { - deptPermissionService.removeByIds(deptPermissionIds); - return ResponseData.success(); - } - - /** - * 修改组织业务支持配置 - */ - @RequestMapping(value = "/update") - @ResponseBody - public Object update(DeptPermission deptPermission) { - deptPermissionService.updateById(deptPermission); - return ResponseData.success(); - } - - @GetMapping(value = "/getAuthorByDept") - @ResponseBody - public Object getAuthorByDept() { - SuccessResponseData resultData = new SuccessResponseData(); - resultData.setCode(200); - resultData.setMessage("查询详情成功"); - - //递归查询组织相关配置数据 - DeptPermission deptPermission = deptPermissionService.selectDeptPermission(service.getAuthService().getLoginUser().getDeptId()); - if (deptPermission != null) { - deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); - deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); - deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); - } - resultData.setData(deptPermission); - return resultData; - } - - - @GetMapping(value = "/getAreaByDept") - @ResponseBody - public Object getAreaByDept(Long deptId) { - if (deptId == null) { - throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); - } - SuccessResponseData resultData = new SuccessResponseData(); - resultData.setCode(200); - resultData.setMessage("查询详情成功"); - //递归查询组织相关配置数据 - resultData.setData(deptPermissionService.selectDeptPermission(deptId)); - return resultData; - } - - /** - * 组织业务支持配置详情 - */ - @RequestMapping(value = "/detail/{deptPermissionId}") - @ResponseBody - public Object detail(@PathVariable("deptPermissionId") String deptPermissionId) { - return ResponseData.success(deptPermissionService.getById(deptPermissionId)); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index e57b310..18b8650 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -29,7 +29,6 @@ * 获取分页列表SMI */ @RequestMapping(value = "/listPage") - @ResponseBody public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); @@ -40,7 +39,6 @@ * 新增SMI */ @RequestMapping(value = "/add") - @ResponseBody public Object addImei(@RequestBody DeviceImei deviceImei) { return deviceImeiService.addImei(deviceImei); } @@ -49,7 +47,6 @@ * 更新SMI */ @RequestMapping(value = "/update") - @ResponseBody public Object editImei(@RequestBody DeviceImei deviceImei) { return deviceImeiService.editImei(deviceImei); } @@ -58,7 +55,6 @@ * 删除imei */ @RequestMapping(value = "/delete/{id}") - @ResponseBody public Object deleteImei(@PathVariable("id") Long id) { return deviceImeiService.deleteImei(id); } @@ -67,7 +63,6 @@ * 批量导入SMI */ @RequestMapping(value = "/batchImport") - @ResponseBody public Object importImei(@RequestParam("file") MultipartFile uploadFile) { return deviceImeiService.importImeiList(uploadFile); }