From 652fa52ee657d4428a6790aca345948bd909b7c6 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: Thu, 28 Nov 2024 17:14:42 +0800 Subject: [PATCH] =?UTF-8?q?2024/11/28=20=20=2017=EF=BC=9A14=20=20=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E7=9D=A3=E5=AF=9F=E5=AE=8C=E6=88=901.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/datav/DataGobalController.java | 155 +++++-------- .../datav/DataVCaseVerifController.java | 1 - .../datav/SupervisionNotifyController.java | 206 +++++++++++------- .../supervision/mapper/NegativeMapper.java | 161 ++++++-------- .../pojo/vo/DayTimeSuperviseVo.java | 21 ++ .../pojo/vo/OrganizeProblemRankVo.java | 2 +- .../biutag/supervision/pojo/vo/RankVo.java | 4 +- .../supervision/service/DataGobalService.java | 147 +++++++------ .../DataSupervisionNotifyServiceImpl.java | 151 ++++--------- 9 files changed, 398 insertions(+), 450 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/DayTimeSuperviseVo.java diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java index c11c469..f02940c 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java @@ -3,24 +3,24 @@ package com.biutag.supervision.controller.datav; import com.alibaba.fastjson.JSONObject; import com.biutag.supervision.pojo.Result; -import com.biutag.supervision.pojo.vo.*; +import com.biutag.supervision.pojo.vo.EchartsVo; +import com.biutag.supervision.pojo.vo.GobalMapIconVo; +import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo; +import com.biutag.supervision.pojo.vo.StrongProblemRank; import com.biutag.supervision.service.DataGobalService; -import com.biutag.supervision.service.DataSupervisionNotifyServiceImpl; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.activation.DataHandler; import lombok.RequiredArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.time.YearMonth; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; /** @@ -39,49 +39,8 @@ public class DataGobalController { private final DataGobalService dataGobalService; - /** - * 获取数据大屏概览 - * 大屏中央数据 - * - * @param beginTime - * @param endTime - * @return - */ - @Operation(summary = "大屏中央数据") - @GetMapping - public Result getAllGobalCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - // 获取数据大屏中央总数概览 - JSONObject overview = dataGobalService.getAllGobalCount(beginTime, endTime); - JSONObject data = new JSONObject() - .fluentPut("overview", overview); - return Result.success(data); - } - - - /** - * 数据大屏问题趋势统计（按月展示） - * - * @param year - * @return - */ - @Operation(summary = "数据大屏问题趋势统计") - @GetMapping("/getGobalRecentlyTrendByMonth") - public Result getGobalRecentlyTrendByMonth(@RequestParam Integer year) { - List gobalRecentlyTrendList = dataGobalService.getGobalRecentlyTrendByMonth(String.valueOf(year)); - JSONObject jsonObject = new JSONObject() - .fluentPut("gobalRecentlyTrendList", gobalRecentlyTrendList); - return Result.success(jsonObject); - } - - - /** - * 机构问题排名 - * - * @param beginTime - * @param endTime - * @return - */ + //region 左边 + // 机构问题排名 @Operation(summary = "机构问题排名") @GetMapping("/getOrganizationRank") public Result getOrganizationRank(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -97,13 +56,7 @@ public class DataGobalController { } - /** - * 业务类型占比 - * - * @param beginTime - * @param endTime - * @return - */ + // 业务类型占比 @Operation(summary = "业务类型占比") @GetMapping("/getBusinessRate") public Result getBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -113,34 +66,60 @@ public class DataGobalController { JSONObject res = new JSONObject().fluentPut("ywzblist", ywzblist); return Result.success(res); } + //endregion + + + //region 中间 + // 获取首页大屏中央数据 + @Operation(summary = "大屏中央数据") + @GetMapping + public Result getAllGobalCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + // 获取数据大屏中央总数概览 + JSONObject overview = dataGobalService.getAllGobalCount(beginTime, endTime); + JSONObject data = new JSONObject().fluentPut("overview", overview); + return Result.success(data); + } + + // 地图数据 + @Operation(summary = "地图数据") + @GetMapping("/getMap") + public Result getMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + + // 地图数据 + List gobalTempMapVoList = Optional.ofNullable(dataGobalService.getMapIconInfo(beginTime, endTime)). + orElseGet(ArrayList::new); + JSONObject data = new JSONObject().fluentPut("gobalTempMapVoList", gobalTempMapVoList); + return Result.success(data); + } + + + // 数据大屏问题趋势统计（按月展示） + @Operation(summary = "数据大屏问题趋势统计") + @GetMapping("/getGobalRecentlyTrendByMonth") + public Result getGobalRecentlyTrendByMonth(@RequestParam Integer year) { + List gobalRecentlyTrendList = dataGobalService.getGobalRecentlyTrendByMonth(String.valueOf(year)); + JSONObject jsonObject = new JSONObject().fluentPut("gobalRecentlyTrendList", gobalRecentlyTrendList); + return Result.success(jsonObject); + } + //endregion - /** - * 突出问题排名 - * - * @param beginTime - * @param endTime - * @return - */ + //region 右边 + // 突出问题排名 @Operation(summary = "突出问题排名") @GetMapping("/getStrongProblemRate") public Result getStrongProblemRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 突出问题排名 List tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime); - JSONObject res = new JSONObject() - .fluentPut("tcwtlist", tcwtlist); + JSONObject res = new JSONObject().fluentPut("tcwtlist", tcwtlist); return Result.success(res); } - /** - * 问题类型占比 - * - * @param beginTime - * @param endTime - * @return - */ + // 问题类型占比 @Operation(summary = "问题类型占比") @GetMapping("/getProblemBusinessRate") public Result getProblemBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @@ -148,33 +127,9 @@ public class DataGobalController { // 问题类型占比 List wtlxlist = dataGobalService.getProblemRate(beginTime, endTime); - JSONObject res = new JSONObject() - .fluentPut("wtlxlist", wtlxlist); + JSONObject res = new JSONObject().fluentPut("wtlxlist", wtlxlist); return Result.success(res); } - - - /** - * 地图数据 - * - * @param beginTime - * @param endTime - * @return - */ - @Operation(summary = "地图数据") - @GetMapping("/getMap") - public Result getMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - - // 地图数据 - List gobalTempMapVoList = Optional.ofNullable(dataGobalService.getMapIconInfo(beginTime, endTime)). - orElseGet(ArrayList::new); - JSONObject data = new JSONObject() - .fluentPut("gobalTempMapVoList", gobalTempMapVoList); - return Result.success(data); - - - } - + //endregion } diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java index 3464a41..787d555 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -80,7 +80,6 @@ public class DataVCaseVerifController { @GetMapping("/getAllCaseVerifCount") public Result getAllCaseVerifCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - // 案件总数（起） long total = dataCaseVerifService.count(new LambdaQueryWrapper().between(DataCaseVerif::getDiscoveryTime, beginTime, endTime)); Integer confirmed = dataCaseVerifService.getConfirmed(beginTime, endTime); // 查实案件数 diff --git a/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java index 98520db..f5615fa 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java @@ -34,78 +34,50 @@ public class SupervisionNotifyController { private final DataSupervisionNotifyServiceImpl dataSupervisionNotifyService; - /** - * 获取现场督察大屏数据 - * - * @return - */ - @Operation(summary = "获取所有督察通知相关数量") - @GetMapping - public Result getAllSupervisionNotifyCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - JSONObject overview = dataSupervisionNotifyService.getAllSupervisionNotifyCount(beginTime, endTime); - //问题类型占比 - List wtlxList = dataSupervisionNotifyService.getProblemTypeRatio(beginTime, endTime); +// region 左边 - //地图数据 - List superviseTempMapVoList = dataSupervisionNotifyService.getsupervisionMapIconInfo(beginTime, endTime); - - // 黄赌毒总览 - JSONObject hddOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime); - - // 黄毒赌列表 - List hddList = dataSupervisionNotifyService.getYellowBet(beginTime, endTime); - - JSONObject data = new JSONObject().fluentPut("wtlxList", wtlxList) - .fluentPut("overview", overview) - .fluentPut("superviseTempMapVoList", superviseTempMapVoList) - .fluentPut("hddList", hddList) - .fluentPut("hddOverview", hddOverview); - return Result.success(data); - } - - - /** - * 获取日常督察排行 - * - * @param groupType 分组类型 1: 分县市局 2: 局属单位 - * @return - */ + //获取日常督察情况 @Operation(summary = "获取日常督察数量概览和整改率排名") @GetMapping("/rank") - public Result getChangedRank(@RequestParam Integer groupType, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + public Result getChangedRank(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - RankVoSup temp = dataSupervisionNotifyService.getSuperversionRank(beginTime, endTime); - JSONObject rankOverview = new JSONObject() - .fluentPut("proTotal", temp.getProblemNumber()) - .fluentPut("changing", temp.getRectifingNumber()) - .fluentPut("changed", temp.getRectifedNumber()) - .fluentPut("correctionRate", temp.getRectifyRate()); - - List changedRankList = dataSupervisionNotifyService.getChangedRateRank(groupType, beginTime, endTime); + DayTimeSuperviseVo fxsjRankOverview = dataSupervisionNotifyService.getSuperversionRank(beginTime, endTime, 3); + DayTimeSuperviseVo jsdwRankOverview = dataSupervisionNotifyService.getSuperversionRank(beginTime, endTime, 4); + List fxsjChangedRankList = dataSupervisionNotifyService.getChangedRateRank(3, beginTime, endTime); + List jsdwChangedRankList = dataSupervisionNotifyService.getChangedRateRank(4, beginTime, endTime); JSONObject data = new JSONObject() - .fluentPut("rankOverview", rankOverview) - .fluentPut("changedRankList", changedRankList); + .fluentPut("fxsjRankOverview", fxsjRankOverview) + .fluentPut("jsdwRankOverview", jsdwRankOverview) + .fluentPut("fxsjChangedRankList", fxsjChangedRankList) + .fluentPut("jsdwChangedRankList", jsdwChangedRankList); return Result.success(data); } - - /** - * 获取现场督察问题趋势 - */ - @GetMapping("/getSupervisionTrend") - public Result getSupervisionTrend(@RequestParam String year) { - List supervisionTrend = dataSupervisionNotifyService.getSupervisionTrend(year); - JSONObject data = new JSONObject().fluentPut("supervisionTrend", supervisionTrend); + //问题类型占比 + @GetMapping("/getProblemTypeRate") + public Result getProblemTypeRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + List wtlxList = dataSupervisionNotifyService.getProblemTypeRatio(beginTime, endTime); + JSONObject data = new JSONObject().fluentPut("wtlxList", wtlxList); return Result.success(data); } +// endregion + +// region 中间 - /** - * 地图数据 - */ + //获取现场督察大屏中央数据 + @Operation(summary = "获取所有督察通知相关数量") + @GetMapping + public Result getAllSupervisionNotifyCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + JSONObject overview = dataSupervisionNotifyService.getAllSupervisionNotifyCount(beginTime, endTime); + JSONObject data = new JSONObject().fluentPut("overview", overview); + return Result.success(data); + } + + // 地图数据 @GetMapping("/getMap") public Result getMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { @@ -115,35 +87,117 @@ public class SupervisionNotifyController { return Result.success(data); } - - /** - * 问题类型占比 - * - * @return - */ - @GetMapping("/getProblemTypeRate") - public Result getProblemTypeRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - List wtlxList = dataSupervisionNotifyService.getProblemTypeRatio(beginTime, endTime); - JSONObject data = new JSONObject().fluentPut("wtlxList", wtlxList); + // 获取现场督察问题趋势 + @GetMapping("/getSupervisionTrend") + public Result getSupervisionTrend(@RequestParam String year) { + List supervisionTrend = dataSupervisionNotifyService.getSupervisionTrend(year); + JSONObject data = new JSONObject().fluentPut("supervisionTrend", supervisionTrend); return Result.success(data); } +// endregion - /** - * 黄赌毒数据 - */ +// region 右边 + // 黄赌毒数据 @GetMapping("/getYellowBetDrug") public Result getYellowBetDrug(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 黄赌毒总览 - JSONObject hddOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime); + DayTimeSuperviseVo fxsjYellowBetOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 1); + DayTimeSuperviseVo jsdwYellowBetOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 1); // 黄毒赌列表 - List hddList = dataSupervisionNotifyService.getYellowBet(beginTime, endTime); - JSONObject data = new JSONObject().fluentPut("hddOverview", hddOverview).fluentPut("hddList", hddList); + List fxsjYellowBetRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 1); + List jsdwYellowBetRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 1); + + JSONObject data = new JSONObject() + .fluentPut("fxsjYellowBetOverview", fxsjYellowBetOverview) + .fluentPut("jsdwYellowBetOverview", jsdwYellowBetOverview) + .fluentPut("fxsjYellowBetRankList", fxsjYellowBetRankList) + .fluentPut("jsdwYellowBetRankList", jsdwYellowBetRankList); + return Result.success(data); + } + + + + // 枪支管理数据 + @GetMapping("/getGunController") + public Result getGunController(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + // 枪支管理总览 + DayTimeSuperviseVo fxsjGunControllerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 2); + DayTimeSuperviseVo jsdwGunControllerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 2); + // 枪支管理列表 + List fxsjGunControllerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 2); + List jsdwGunControllerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 2); + + JSONObject data = new JSONObject() + .fluentPut("fxsjGunControllerOverview", fxsjGunControllerOverview) + .fluentPut("jsdwGunControllerOverview", jsdwGunControllerOverview) + .fluentPut("fxsjGunControllerRankList", fxsjGunControllerRankList) + .fluentPut("jsdwGunControllerRankList", jsdwGunControllerRankList); + return Result.success(data); + } + + // 涉企问题数据 + @GetMapping("/getCompanyProblem") + public Result getCompanyProblem(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + // 涉企问题总览 + DayTimeSuperviseVo fxsjCompanyProblemOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 3); + DayTimeSuperviseVo jsdwCompanyProblemOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 3); + // 涉企问题列表 + List fxsjCompanyProblemRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 3); + List jsdwCompanyProblemRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 3); + + JSONObject data = new JSONObject() + .fluentPut("fxsjCompanyProblemOverview", fxsjCompanyProblemOverview) + .fluentPut("jsdwCompanyProblemOverview", jsdwCompanyProblemOverview) + .fluentPut("fxsjCompanyProblemRankList", fxsjCompanyProblemRankList) + .fluentPut("jsdwCompanyProblemRankList", jsdwCompanyProblemRankList); + return Result.success(data); + } + + // 执法办案数据 + @GetMapping("/getHandleCase") + public Result getHandleCase(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + // 执法办案总览 + DayTimeSuperviseVo fxsjHandleCaseOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 4); + DayTimeSuperviseVo jsdwHandleCaseOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 4); + // 执法办案列表 + List fxsjHandleCaseRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 4); + List jsdwHandleCaseRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 4); + + JSONObject data = new JSONObject() + .fluentPut("fxsjHandleCaseOverview", fxsjHandleCaseOverview) + .fluentPut("jsdwHandleCaseOverview", jsdwHandleCaseOverview) + .fluentPut("fxsjHandleCaseRankList", fxsjHandleCaseRankList) + .fluentPut("jsdwHandleCaseRankList", jsdwHandleCaseRankList); return Result.success(data); } + // 工作日测酒数据 + @GetMapping("/getCheckBeer") + public Result getCheckBeer(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + // 工作日测酒总览 + DayTimeSuperviseVo fxsjCheckBeerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 3, 5); + DayTimeSuperviseVo jsdwCheckBeerOverview = dataSupervisionNotifyService.getYellowBetOverview(beginTime, endTime, 4, 5); + // 工作日测酒列表 + List fxsjCheckBeerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 3, 5); + List jsdwCheckBeerRankList = dataSupervisionNotifyService.getYellowBetRankList(beginTime, endTime, 4, 5); + + JSONObject data = new JSONObject() + .fluentPut("fxsjCheckBeerOverview", fxsjCheckBeerOverview) + .fluentPut("jsdwCheckBeerOverview", jsdwCheckBeerOverview) + .fluentPut("fxsjCheckBeerRankList", fxsjCheckBeerRankList) + .fluentPut("jsdwCheckBeerRankList", jsdwCheckBeerRankList); + return Result.success(data); + } + +// endregion + + } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 2d04287..1a43b44 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -30,6 +30,7 @@ public interface NegativeMapper extends BaseMapper { "ORDER BY `value` DESC ") List selectOrganizeProblemRank(Integer groupType, Date beginTime, Date endTime); + // 业务类型占比 @Select("SELECT businessTypeName as name, count(*) value FROM negative " + "WHERE " + "discoveryTime BETWEEN #{beginTime} and #{endTime} and checkStatus=1 " + @@ -37,13 +38,6 @@ public interface NegativeMapper extends BaseMapper { List selectBusinessRate(Date beginTime, Date endTime); - @Select("SELECT DATE_FORMAT(ng.discoveryTime, '%Y-%m') AS monthTime, COUNT(*) total FROM negative ng " + - "WHERE YEAR(ng.discoveryTime)=#{year} and checkStatus=1 " + - "GROUP BY monthTime " + - "order BY monthTime asc") - List selectRecentTrendByMonth(String year); - - @Select("SELECT count(*) FROM negative ng INNER JOIN " + " (" + " SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " + @@ -99,35 +93,40 @@ public interface NegativeMapper extends BaseMapper { "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoSjdc(Date beginTime, Date endTime, Integer departId); + List getGobalRecentlyTrendByMonth(String year); + // endregion // region 现场督察大屏 - /** - * 获取现场督察按二级机构分组和整改状态划分的的问题数 - */ - @Select("SELECT COUNT(*) FROM negative n " + - "INNER JOIN ( " + - " SELECT DISTINCT sd.id " + - " FROM sup_depart sd " + - " INNER JOIN sup_depart sd1 ON sd.pid = sd1.id " + - " WHERE sd1.statistics_group_id = #{groupType}" + - ") AS filtered_sd ON n.involveDepartId = filtered_sd.id " + - "WHERE n.checkStatus = 1 " + - "AND n.problemSourcesCode = 13 " + - "AND n.isRectifyCode=#{isRectify} " + - "AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}") - Long getChangCountByGroupType(Integer groupType, Date beginTime, Date endTime, Integer isRectify); - - - - - - - - - + @Select("SELECT count(DISTINCT(ng.id)) as proTotal, " + + "count(DISTINCT IF(ng.isRectifyCode = 1, ng.id, null) ) as changed, " + + "count(DISTINCT IF(ng.isRectifyCode = 0, ng.id, null) ) as changing, " + + "ROUND((COUNT(DISTINCT IF(ng.isRectifyCode = 1, ng.id, null))) / COUNT(DISTINCT ng.id) * 100, 1) AS correctionRate " + + "FROM sup_depart sd " + + "INNER JOIN sup_depart sd1 on sd.pid=sd1.id AND sd1.statistics_group_id=#{groupId} " + + "INNER JOIN negative ng ON sd.id=ng.involveDepartId " + + "WHERE ng.problemSourcesCode=13 AND ng.checkStatus<>3 " + + "AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") + DayTimeSuperviseVo getSuperversionRank(Date beginTime, Date endTime, Integer groupId); + + @Select("SELECT sd1.short_name as label, " + + "sd1.id AS departId, " + + "count( DISTINCT ng.id) AS denominator, " + + "count( DISTINCT IF(ng.isRectifyCode=1, ng.id, NULL )) AS numerator, " + + "ROUND( COUNT(DISTINCT if(ng.isRectifyCode=1, ng.id, NULL)) / count(DISTINCT ng.id)*100, 1 ) AS rate, " + + "ROUND( COUNT(DISTINCT if(ng.isRectifyCode=1, ng.id, NULL)) / count(DISTINCT ng.id)*100, 1 ) AS value " + + "FROM sup_depart sd " + + "INNER JOIN sup_depart sd1 on sd.pid=sd1.id AND sd1.statistics_group_id=#{groupId} " + + "INNER JOIN negative ng on ng.involveDepartId=sd.id " + + "LEFT JOIN negative_blame nb on ng.id=nb.negativeId " + + "WHERE ng.problemSourcesCode=13 " + + "AND ng.checkStatus<>3 " + + "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " + + "GROUP BY label " + + "order by rate desc") + List getChangedRateRank(Date beginTime, Date endTime, Integer groupId); @Select("SELECT npr.oneLevelContent as name, count(*) value FROM negative ng, negative_problem_relation npr " + "WHERE ng.id = npr.negativeId " + @@ -136,66 +135,7 @@ public interface NegativeMapper extends BaseMapper { "AND ng.discoveryTime BETWEEN #{beginTime} AND #{endTime} " + "AND oneLevelContent is NOT NULL " + "GROUP BY oneLevelContent ") - List getProblemTypes(Date beginTime, Date endTime); - - - - List getSupervisionTrend(String time); - - - - - @Select("SELECT a.departId, a.name, COUNT(DISTINCT c.id) AS totalPro, COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS changing, COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS changed, COUNT(DISTINCT c.involveDepartId) AS relationOrg, COUNT(DISTINCT d.blameIdCode) AS personNum, ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS changedRate\n" + - "FROM statistics_depart a INNER JOIN sup_depart b ON a.departId = b.pid " + - " INNER JOIN negative c ON b.id = c.involveDepartId " + - " LEFT JOIN negative_blame d ON c.id = d.negativeId " + - "WHERE a.groupId = 3 AND discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND problemSourcesCode IN (13, 15) " + - "GROUP BY a.name, a.departId") - List getMap(Date beginTime, Date endTime); - - - /** - * 黄赌毒总览 - * @param beginTime - * @param endTime - * @return - */ - @Select("SELECT a.name , " + - "COUNT(DISTINCT c.id) AS problem_number, " + - "COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS rectifing_number, " + - "COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS rectifed_number, " + - "COUNT(DISTINCT c.involveDepartId) AS depart_number, " + - "COUNT(DISTINCT d.blameIdCode) AS person_number, " + - "ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS rectify_rate " + - "FROM statistics_depart a INNER JOIN sup_depart b ON a.departId = b.pid " + - "INNER JOIN negative c ON b.id = c.involveDepartId " + - "LEFT JOIN negative_blame d ON c.id = d.negativeId " + - "WHERE a.groupId = 3 AND discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND special_supervision = 1 " + - "GROUP BY a.name " + - "order by problem_number desc") - List getYellowBet(Date beginTime, Date endTime); - - @Select("SELECT COUNT(DISTINCT c.id) AS problem_number, COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS rectifing_number, COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS rectifed_number, COUNT(DISTINCT c.involveDepartId) AS depart_number, COUNT(DISTINCT d.blameIdCode) AS person_number, ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS rectify_rate " + - "FROM sup_depart b INNER JOIN negative c ON b.id = c.involveDepartId " + - " LEFT JOIN negative_blame d ON c.id = d.negativeId " + - "WHERE discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND problemSourcesCode = 13 ") - RankVoSup getSuperversionRank(Date beginTime, Date endTime); - - - @Select("SELECT a.name, " + - "COUNT(DISTINCT c.id) AS problem_number, " + - "COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS rectifing_number, " + - "COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS rectifed_number, " + - "COUNT(DISTINCT c.involveDepartId) AS depart_number, " + - "COUNT(DISTINCT d.blameIdCode) AS person_number, " + - "ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS rectify_rate " + - "FROM statistics_depart a INNER JOIN sup_depart b ON a.departId = b.pid " + - " INNER JOIN negative c ON b.id = c.involveDepartId " + - " LEFT JOIN negative_blame d ON c.id = d.negativeId " + - "WHERE a.groupId = 3 AND discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND problemSourcesCode = 13 " + - "GROUP BY a.name " + - "order by rectify_rate desc") - List getChangedRateRank(Date beginTime, Date endTime); + List getProblemTypeRatio(Date beginTime, Date endTime); @Select("SELECT COUNT(DISTINCT c.id) AS problem_number, " + "COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS rectifing_number, " + @@ -207,14 +147,41 @@ public interface NegativeMapper extends BaseMapper { "WHERE discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND problemSourcesCode IN (13, 15)") RankVoSupTwo getTemp(Date beginTime, Date endTime); - - @Select("SELECT COUNT(DISTINCT c.id) AS problem_number, COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS rectifing_number, COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS rectifed_number, COUNT(DISTINCT c.involveDepartId) AS depart_number, COUNT(DISTINCT d.blameIdCode) AS person_number, ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS rectify_rate\n" + - "FROM sup_depart b INNER JOIN negative c ON b.id = c.involveDepartId " + + @Select("SELECT a.departId, a.name, COUNT(DISTINCT c.id) AS totalPro, COUNT(DISTINCT IF(c.isRectifyCode = 0, c.id, 0)) - 1 AS changing, COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1 AS changed, COUNT(DISTINCT c.involveDepartId) AS relationOrg, COUNT(DISTINCT d.blameIdCode) AS personNum, ROUND((COUNT(DISTINCT IF(c.isRectifyCode = 1, c.id, 0)) - 1) / COUNT(DISTINCT c.id) * 100, 1) AS changedRate\n" + + "FROM statistics_depart a INNER JOIN sup_depart b ON a.departId = b.pid " + + " INNER JOIN negative c ON b.id = c.involveDepartId " + " LEFT JOIN negative_blame d ON c.id = d.negativeId " + - "WHERE discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND special_supervision = 1 ") - RankVoSup getYellowBetOverview(Date beginTime, Date endTime); + "WHERE a.groupId = 3 AND discoveryTime BETWEEN #{beginTime} AND #{endTime} AND checkStatus IN ('1', '2') AND problemSourcesCode IN (13, 15) " + + "GROUP BY a.name, a.departId") + List getMap(Date beginTime, Date endTime); - List getGobalRecentlyTrendByMonth(String year); + List getSupervisionTrend(String time); + + @Select("SELECT count(DISTINCT(ng.id)) as proTotal, " + + "count(DISTINCT IF(ng.isRectifyCode = 1, ng.id, null) ) as changed," + + "count(DISTINCT IF(ng.isRectifyCode = 0, ng.id, null) ) as changing," + + "ROUND(COALESCE(COUNT(DISTINCT IF(ng.isRectifyCode = 1, ng.id, NULL)) / NULLIF(COUNT(DISTINCT ng.id), 0), 0) * 100, 1) AS correctionRate " + + "FROM sup_depart sd " + + "INNER JOIN sup_depart sd1 ON sd.pid=sd1.id AND sd1.statistics_group_id=#{groupId} " + + "INNER JOIN negative ng on sd.id=ng.involveDepartId " + + "WHERE ng.checkStatus<>3 " + + "AND ng.problemSourcesCode=15 " + + "AND special_supervision = #{queryType} " + + "AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") + DayTimeSuperviseVo getYellowBetOverview(Date beginTime, Date endTime, Integer groupId, Integer queryType); + + @Select("SELECT sd1.short_name as label, " + + "count( DISTINCT ng.id) AS value " + + "FROM sup_depart sd " + + "INNER JOIN sup_depart sd1 on sd.pid=sd1.id AND sd1.statistics_group_id=#{groupId} " + + "INNER JOIN negative ng on sd.id= ng.involveDepartId " + + "WHERE ng.checkStatus<>3 " + + "AND ng.problemSourcesCode=15 " + + "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " + + "AND special_supervision = #{queryType} " + + "GROUP BY label " + + "order by value desc") + List getYellowBetRankList(Date beginTime, Date endTime, Integer groupId, Integer queryType); // endregion diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DayTimeSuperviseVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DayTimeSuperviseVo.java new file mode 100644 index 0000000..87b7f81 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/DayTimeSuperviseVo.java @@ -0,0 +1,21 @@ +package com.biutag.supervision.pojo.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Auther: sh + * @Date: 2024/11/28 10:32 + * @Description: 日常督察情况总览 也可用于 专项督察情况总览 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DayTimeSuperviseVo { + private Integer proTotal; + private Integer changed; + private Integer changing; + private Double correctionRate; +} + diff --git a/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java b/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java index c3ea260..b19719a 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java @@ -5,7 +5,7 @@ import lombok.Data; /** * @Auther: sh * @Date: 2024/11/8 11:17 - * @Description: 首页大屏机构问题排名VO + * @Description: 机构问题排名VO */ @Data public class OrganizeProblemRankVo { diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java index 00c9c49..4cb73c9 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java @@ -12,9 +12,9 @@ public class RankVo { private String label; // 部门名称 private String departId; // 部门id - private String value; // 整改率 - private String rate; // 整改率 private String numerator; // 分子 已整改 private String denominator; // 分母 问题数 + private String rate; // 整改率 + private String value; // 整改率 } diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java index 838308e..b5e7414 100644 --- a/src/main/java/com/biutag/supervision/service/DataGobalService.java +++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java @@ -32,13 +32,27 @@ public class DataGobalService { private final NegativeProblemRelationMapper negativeProblemRelationMapper; private final SupDepartMapper supDepartMapper; - /** - * 获取所有大屏统计数据 - * - * @param beginTime 开始时间 - * @param endTime 结束时间 - * @return 返回所有大屏统计数据 - */ + +//region 左边 + + // 机构问题排名 + public List getOrganizeProblemRank(Integer groupType, Date beginTime, Date endTime) { + List res = negativeMapper.selectOrganizeProblemRank(groupType, beginTime, endTime); + return res; + } + + // 业务类型占比 + public List getBusinessRate(Date beginTime, Date endTime) { + List res = negativeMapper.selectBusinessRate(beginTime, endTime); + return res; + } +//endregion + + + +//region 中间 + + // 获取首页大屏中央统计数据 public JSONObject getAllGobalCount(Date beginTime, Date endTime) { // 督察问题数量(查实版本) @@ -77,74 +91,13 @@ public class DataGobalService { return overview; } - - /** - * 查询核查属实的公共方法 - * - * @param checkStatus 检查状态 - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param problemSourcesCodes 问题来源代码数组 - * @return 满足条件的记录数 - */ - public Long getCountByConditions(Integer checkStatus, Date startTime, Date endTime, Integer... problemSourcesCodes) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("checkStatus", checkStatus) - .between("discoveryTime", startTime, endTime) - .and(wrapper -> { - for (int i = 0; i < problemSourcesCodes.length; i++) { - if (i == 0) { - wrapper.eq("problemSourcesCode", problemSourcesCodes[i]); - } else { - wrapper.or().eq("problemSourcesCode", problemSourcesCodes[i]); - } - } - }); - return negativeMapper.selectCount(queryWrapper); - } - - public List getOrganizeProblemRank(Integer groupType, Date beginTime, Date endTime) { - List res = negativeMapper.selectOrganizeProblemRank(groupType, beginTime, endTime); - return res; - } - - public List getBusinessRate(Date beginTime, Date endTime) { - List res = negativeMapper.selectBusinessRate(beginTime, endTime); - return res; - } - + // 数据大屏问题趋势统计（按月展示） public List getGobalRecentlyTrendByMonth(String year) { List res = negativeMapper.getGobalRecentlyTrendByMonth(year); return res; } - /** - * 获取问题类型占比 - * - * @param beginTime - * @param endTime - * @return - */ - public List getProblemRate(Date beginTime, Date endTime) { - List res = negativeProblemRelationMapper.selectProblemRate(beginTime, endTime); - return res; - } - - /** - * 获取突出问题排名 - * @return - */ - public List getStrongProblemRank(Date beginTime, Date endTime) { - // 1.获取这段时间的negative id - List res = negativeProblemRelationMapper.selectStrongProblemRank(beginTime, endTime); - for (int i = 1; i <= res.size(); i++) { - res.get(i - 1).setSort(i); - } - return res; - } - - - + // 地图数据 public List getMapIconInfo(Date beginTime, Date endTime) { List res = new ArrayList<>(); List supDeparts = supDepartMapper.selectDepartsByGroupType(3); @@ -171,4 +124,58 @@ public class DataGobalService { } return res; } +//endregion + + + +//region 右边 + + // 获取突出问题排名 + public List getStrongProblemRank(Date beginTime, Date endTime) { + // 1.获取这段时间的negative id + List res = negativeProblemRelationMapper.selectStrongProblemRank(beginTime, endTime); + for (int i = 1; i <= res.size(); i++) { + res.get(i - 1).setSort(i); + } + return res; + } + + // 获取问题类型占比 + public List getProblemRate(Date beginTime, Date endTime) { + List res = negativeProblemRelationMapper.selectProblemRate(beginTime, endTime); + return res; + } +//endregion + + + + + + + /** + * 查询核查属实的公共方法 + * + * @param checkStatus 检查状态 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param problemSourcesCodes 问题来源代码数组 + * @return 满足条件的记录数 + */ + public Long getCountByConditions(Integer checkStatus, Date startTime, Date endTime, Integer... problemSourcesCodes) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ne("checkStatus", checkStatus) + .between("discoveryTime", startTime, endTime) + .and(wrapper -> { + for (int i = 0; i < problemSourcesCodes.length; i++) { + if (i == 0) { + wrapper.eq("problemSourcesCode", problemSourcesCodes[i]); + } else { + wrapper.or().eq("problemSourcesCode", problemSourcesCodes[i]); + } + } + }); + return negativeMapper.selectCount(queryWrapper); + } + + } diff --git a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java index 2bb3fe8..9e00ea2 100644 --- a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java @@ -22,10 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.Intercept; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.IllegalFormatCodePointException; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -40,16 +37,38 @@ import java.util.stream.Collectors; public class DataSupervisionNotifyServiceImpl extends ServiceImpl { private final NegativeMapper negativeMapper; - private final NegativeBlameMapper negativeBlameMapper; - private final SupDepartMapper supDepartMapper; + +// region 左边 + + // 获取日常督察情况总览 + public DayTimeSuperviseVo getSuperversionRank(Date beginTime, Date endTime, Integer groupId) { + DayTimeSuperviseVo res = negativeMapper.getSuperversionRank(beginTime, endTime, groupId); + if (res == null) { + return new DayTimeSuperviseVo(0, 0, 0, 0.0); + } + return res; + } + + // 获取日常督察整改率排名 + public List getChangedRateRank(Integer groupType, Date beginTime, Date endTime) { + // Optional.ofNullable(rankVoRes).orElse(new ArrayList<>()); + List rankVoRes = negativeMapper.getChangedRateRank(beginTime, endTime, groupType); + return rankVoRes; + } + + //问题类型占比 + public List getProblemTypeRatio(Date beginTime, Date endTime) { + List echartsVos = negativeMapper.getProblemTypeRatio(beginTime, endTime); + return echartsVos; + } + +// endregion + +// region 中间 /** * 获取所有 现场督察+专项督察 的数量 * 现场督察代码： 13 专项督察代码: 15 - * - * @param beginTime - * @param endTime - * @return */ public JSONObject getAllSupervisionNotifyCount(Date beginTime, Date endTime) { @@ -86,115 +105,41 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl getChangedRateRank(Integer groupType, Date beginTime, Date endTime) { - List rankVoRes = negativeMapper.getChangedRateRank(beginTime, endTime); - List res = new ArrayList<>(); - for (RankVoSupTwo one : rankVoRes) { - RankVo rankVo = new RankVo(); - rankVo.setLabel(one.getName()); - rankVo.setValue(one.getRectifyRate()); - rankVo.setRate(one.getRectifyRate()); - rankVo.setNumerator(one.getRectifedNumber()); - rankVo.setDenominator(one.getProblemNumber()); - res.add(rankVo); - } - return res; - } - - public List getProblemTypeRatio(Date beginTime, Date endTime) { - List echartsVos = negativeMapper.getProblemTypes(beginTime, endTime); - return echartsVos; - } - - + // 获取现场督察问题趋势 public List getSupervisionTrend(String year) { List echartsVos = negativeMapper.getSupervisionTrend(year); return echartsVos; } - /** - * 包括现场督察和专项 - * - * @param beginTime - * @param endTime - * @return - */ + + // 地图数据 public List getsupervisionMapIconInfo(Date beginTime, Date endTime) { List res = negativeMapper.getMap(beginTime, endTime); return res; } - public List getYellowBet(Date beginTime, Date endTime) { - List res = negativeMapper.getYellowBet(beginTime, endTime); - List resv = new ArrayList<>(); - if (res == null) { - return resv; - } - for (RankVoSupTwo re : res) { - log.info("名字===========" + re.getName() + "驼峰===============" + re.getProblemNumber() + "非驼峰" + re.getProblemNumber()); - RankVo rankVo = new RankVo(); - rankVo.setLabel(re.getName()); - rankVo.setValue(re.getProblemNumber()); - resv.add(rankVo); - } - return resv; - } +// endregion +// region 右边 - public RankVoSup getSuperversionRank(Date beginTime, Date endTime) { - RankVoSup res = negativeMapper.getSuperversionRank(beginTime, endTime); - if (res == null) { - return new RankVoSup("0", "0", "0", "0", "0", "0"); - } + // 黄赌毒总览 但是这个查询可以公用 + public DayTimeSuperviseVo getYellowBetOverview(Date beginTime, Date endTime, Integer groupId, Integer queryType) { + DayTimeSuperviseVo res = negativeMapper.getYellowBetOverview(beginTime, endTime, groupId, queryType); return res; } - public JSONObject getYellowBetOverview(Date beginTime, Date endTime) { - RankVoSup res = negativeMapper.getYellowBetOverview(beginTime, endTime); - if (res != null) { - return new JSONObject() - .fluentPut("proTotal", res.getProblemNumber()) - .fluentPut("changing", res.getRectifingNumber()) - .fluentPut("changed", res.getRectifedNumber()) - .fluentPut("correctionRate", res.getRectifyRate()); - }else { - return new JSONObject() - .fluentPut("problemNumber", "0") - .fluentPut("changing", "0") - .fluentPut("changed", "0") - .fluentPut("correctionRate", "0"); - } + // 黄赌毒排行 但是这个查询可以公用 + public List getYellowBetRankList(Date beginTime, Date endTime, Integer groupId, Integer queryType) { + List res = negativeMapper.getYellowBetRankList(beginTime, endTime, groupId, queryType); + return res; } + +// endregion + + + + + }