From 9b5274da36cc5e4550d8f424dde25be65472aa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?= =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com> Date: Tue, 17 Dec 2024 10:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9C=B0=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/subdatav/SubOneController.java | 22 +++++++-------- .../SubOneVideoSuperviseController.java | 16 ++++++++--- .../supervision/mapper/NegativeMapper.java | 14 +++++++++- .../supervision/pojo/vo/SubOneOverViewVo.java | 2 +- .../supervision/service/SubOneService.java | 2 +- .../service/SubOneVideoSuperviseService.java | 5 ++++ src/main/resources/mapper/NegativeMapper.xml | 27 ++++++++++--------- 7 files changed, 59 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneController.java index 68c23a5..974de38 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneController.java @@ -28,9 +28,9 @@ import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.*; /** * @Auther: sh * @Date: 2024/12/4 16:30 - * @Description: 首页一级子屏 + * @Description: 首页二级大屏 */ -@Tag(name = "首页一级子屏") +@Tag(name = "首页二级大屏") @RequestMapping("datav/sub1/") @RequiredArgsConstructor @RestController @@ -42,7 +42,7 @@ public class SubOneController { // region右边 - @Operation(summary = "获取首页一级子屏督察问题排名") + @Operation(summary = "获取首页二级大屏督察问题排名") @GetMapping("/getSubOneSupervisionRank") public Result getSubOneSupervisionRank(@RequestParam Integer departPId, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -67,13 +67,13 @@ public class SubOneController { /** - * 获取一级子屏总览 + * 获取首页二级大屏总览 * @param departPId 2级单位的id * @param beginTime 开始时间 * @param endTime 结束时间 * @return */ - @Operation(summary = "获取一级子屏总览") + @Operation(summary = "获取首页二级大屏总览") @GetMapping("/getSubOneOverView") public Result getSubOneOverView(@RequestParam Integer departPId, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -92,7 +92,7 @@ public class SubOneController { * @param year 年份 * @return EchartsVo的list */ - @Operation(summary = "获取一级子屏问题趋势") + @Operation(summary = "获取首页二级大屏问题趋势") @GetMapping("/getSubOneTrend") public Result getSubOneTrend(@RequestParam Integer departPId, @RequestParam Integer year) { List superviseProTrend = subOneService.getSubOneTrend(departPId, year, XCDC.getValue(), ZXDC.getValue(), SPDC.getValue()); // 督察问题趋势 @@ -114,7 +114,7 @@ public class SubOneController { * @param departPId 2级单位的id * @return json格式的地图数据 */ - @Operation(summary = "获取一级子屏地图JSON") + @Operation(summary = "获取二级大屏地图JSON") @GetMapping("/getSubOneStreetMap") public Result getSubOneStreetMap(@RequestParam Integer departPId) { List depts = countyStreetDeptService.getSubOneStreetMap(departPId); @@ -131,8 +131,8 @@ public class SubOneController { properties.put("name", dept.getName()); properties.put("id", dept.getId()); feature.put("properties", properties); // 第二个键值 - log.info("===========现在的id是=============="); - log.info(dept.getId().toString()); +// log.info("===========现在的id是=============="); +// log.info(dept.getId().toString()); feature.put("geometry", new Gson().fromJson(dept.getGeometry(), Object.class)); // 第三个键值 features.add(feature); @@ -147,14 +147,14 @@ public class SubOneController { // region右边 /** - * 获取首页一级子屏案件核查排名 + * 获取首页二级大屏案件核查排名 * * @param departPId 2级单位的id * @param beginTime 开始时间 * @param endTime 结束时间 * @return 总览和排名 */ - @Operation(summary = "获取首页一级子屏案件核查排名") + @Operation(summary = "获取首页二级大屏案件核查排名") @GetMapping("/getSubOneCaseVerifyRank") public Result getSubOneCaseVerifyRank(@RequestParam Integer departPId, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java index cd747d1..deee919 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java @@ -139,7 +139,7 @@ public class SubOneVideoSuperviseController { /** - * 视频督察二级大屏中央数据 + * 视频督察二级大屏中央总览数据 * * @param beginTime 开始时间 * @param endTime 结束时间 @@ -156,8 +156,7 @@ public class SubOneVideoSuperviseController { } - // 获取视频督察大屏中央问题趋势统计 - @Operation(summary = "数据大屏问题趋势统计") + @Operation(summary = "视频督察二级数据大屏问题趋势统计") @GetMapping("/getSubOneVideoSuperviseTrend") public Result getSubOneVideoSuperviseTrend(@RequestParam Integer departId, @RequestParam Integer year) { List videoSuperviseTrendList = subOneVideoSuperviseService.getSubOneVideoSuperviseTrend(String.valueOf(year), SPDC.getValue(), departId.toString()); @@ -166,5 +165,16 @@ public class SubOneVideoSuperviseController { } + + @Operation(summary = "视频督察二级数据大屏问题类型占比") + @GetMapping("/getSubOneVideoSuperviseProblemTypeRate") + public Result getSubOneVideoSuperviseProblemTypeRate(@RequestParam Integer departId, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + List subOneVideoSuperviseProblemTypeRate = subOneVideoSuperviseService.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime); + JSONObject jsonObject = new JSONObject().fluentPut("subOneVideoSuperviseProblemTypeRate", subOneVideoSuperviseProblemTypeRate); + return Result.success(jsonObject); + } + } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 0b5c65a..b2d6469 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -57,7 +57,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id=3" + " ) " + "as temp on ng.involveDepartId=temp.id " + - "WHERE ng.checkStatus<>3 AND problemSourcesCode=(17, 18, 19, 20) " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode in (17, 18, 19, 20) " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGlobalMapIconInfoAjhc(Date beginTime, Date endTime, Integer departId); @@ -401,4 +401,16 @@ public interface NegativeMapper extends BaseMapper { List getSubOneVideoSuperviseTrend(String year, String problemCode, String departId); + + @Select("SELECT npr.threeLevelContent AS `name`, " + + "COUNT(*) AS `value` " + + "FROM negative ng " + + "INNER JOIN sup_depart sd ON ng.involveDepartId=sd.id AND sd.pid=#{departId} " + + "INNER JOIN negative_problem_relation npr " + + "on ng.id=npr.negativeId " + + "WHERE ng.problemSourcesCode=16 " + + "AND checkStatus <> 3 " + + "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " + + "GROUP BY npr.threeLevelContent ") + List getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime); } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SubOneOverViewVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SubOneOverViewVo.java index dd19f0d..8a3cdbf 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/SubOneOverViewVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/SubOneOverViewVo.java @@ -15,7 +15,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor public class SubOneOverViewVo implements Serializable { - // 首页大屏一级子屏的各种总览，从左到右对应 + // 首页二级大屏总览的各种总览，从左到右对应 private Integer one; private Integer two; private Integer three; diff --git a/src/main/java/com/biutag/supervision/service/SubOneService.java b/src/main/java/com/biutag/supervision/service/SubOneService.java index 1270fac..6cea00d 100644 --- a/src/main/java/com/biutag/supervision/service/SubOneService.java +++ b/src/main/java/com/biutag/supervision/service/SubOneService.java @@ -14,7 +14,7 @@ import java.util.List; /** * @Auther: sh * @Date: 2024/12/12 15:59 - * @Description: 一级子屏业务层 + * @Description: 首页二级子屏业务层 */ @RequiredArgsConstructor diff --git a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java index 7d46203..23c00cb 100644 --- a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java +++ b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java @@ -41,5 +41,10 @@ public class SubOneVideoSuperviseService { List res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departId); return res; } + + public List getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime) { + List res = negativeMapper.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime); + return res; + } } diff --git a/src/main/resources/mapper/NegativeMapper.xml b/src/main/resources/mapper/NegativeMapper.xml index 97778bc..c7502ea 100644 --- a/src/main/resources/mapper/NegativeMapper.xml +++ b/src/main/resources/mapper/NegativeMapper.xml @@ -85,7 +85,7 @@ GROUP BY m.monthName ORDER BY m.month ASC; - + - + - + - + - - + + +