From dda4778f68d955ab0570f850217abb3835dbc1fd Mon Sep 17 00:00:00 2001 From: pengwei Date: Mon, 26 May 2025 16:32:31 +0800 Subject: [PATCH] fix: --- .../controller/datav/DataVCaseVerifController.java | 8 ++++++++ .../controller/datav/DataVGlobalController.java | 9 ++++++--- .../controller/work/ConfinementController.java | 2 ++ .../biutag/supervision/mapper/NegativeMapper.java | 8 +++++--- .../biutag/supervision/pojo/vo/GlobalMapIconVo.java | 6 ++---- .../supervision/pojo/vo/GlobalOverViewVo.java | 13 ++++++++++++- .../supervision/service/ConfinementService.java | 2 ++ 7 files changed, 37 insertions(+), 11 deletions(-) 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 8c55f9f..d411bb2 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -1,5 +1,6 @@ package com.biutag.supervision.controller.datav; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.biutag.supervision.mapper.DataCaseVerifMapper; import com.biutag.supervision.mapper.NegativeMapper; @@ -50,6 +51,7 @@ public class DataVCaseVerifController { @GetMapping("/getCaseVerificationRank") public Result getCaseVerificationRank(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List fxsjRankList = negativeMapper.getCaseVerificationRank(beginTime, endTime, 3); List jsdwRankList = negativeMapper.getCaseVerificationRank(beginTime, endTime, 4); JSONObject data = new JSONObject() @@ -69,6 +71,7 @@ public class DataVCaseVerifController { @GetMapping("/getCaseProblemProperty") public Result getCaseProblemProperty(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List zfbaPieList = dataCaseVerifMapper.getCaseProblemProperty(beginTime, endTime, 6); // 执法办案 List fwglPieList = dataCaseVerifMapper.getCaseProblemProperty(beginTime, endTime, 11); // 服务管理 JSONObject data = new JSONObject() @@ -92,6 +95,7 @@ public class DataVCaseVerifController { @GetMapping("/getCaseVerificationCount") public Result getAllCaseVerificationCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); CaseVerificationCountVo overview = negativeMapper.getAllCaseVerificationCount(beginTime, endTime); JSONObject res = new JSONObject().fluentPut("overview", overview); return Result.success(res); @@ -110,6 +114,7 @@ public class DataVCaseVerifController { @Cacheable(cacheNames = "Supervision:Screen:CaseVerificationMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()") public Result getCaseVerificationMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List caseVerificationMapList = negativeMapper.getCaseVerificationMap(beginTime, endTime); JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList); return Result.success(res); @@ -124,6 +129,7 @@ public class DataVCaseVerifController { @Operation(summary = "查处问题趋势") @GetMapping("/getCaseVerificationTrend") public Result getCaseVerificationTrend(@RequestParam Integer year) { + List proTrendList = negativeMapper.getTrend(year, A12389.getValue(), SLDJB.getValue(), ZDDJB.getValue(), SJJB.getValue()); JSONObject data = new JSONObject().fluentPut("proTrendList", proTrendList); return Result.success(data); @@ -144,6 +150,7 @@ public class DataVCaseVerifController { @GetMapping("/getCaseSourceRateAndDealSituation") public Result getCaseSourceRateAndDealSituation(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List caseSourceRateList = negativeMapper.getCaseSourceRate(beginTime, endTime); List dealSituationPieList = negativeMapper.getDealSituation(beginTime, endTime); JSONObject data = new JSONObject() @@ -164,6 +171,7 @@ public class DataVCaseVerifController { @GetMapping("/getConfinementAndPause") public Result getConfinementAndPause(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); List jbclList = negativeMapper.getConfinementAndPause(beginTime,endTime, 1); List tzclList = negativeMapper.getConfinementAndPause(beginTime, endTime, 2); // 停职 JSONObject data = new JSONObject() diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java index e6c13e0..590b7c4 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java @@ -11,9 +11,11 @@ import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.DataMailService; import com.biutag.supervision.service.NegativeService; +import com.gbase.jdbc.log.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +35,7 @@ import java.util.List; */ @Tag(name = "数据大屏一级首页", description = "数据大屏一级首页") @RestController +@Slf4j @RequiredArgsConstructor @RequestMapping("datav/dataGlobalScreen") public class DataVGlobalController { @@ -119,12 +122,12 @@ public class DataVGlobalController { */ @Operation(summary = "首页大屏地图Icon数据") @GetMapping("/getGlobalMap") - @Cacheable(cacheNames = "Supervision:Screen:GlobalMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()") +// @Cacheable(cacheNames = "Supervision:Screen:GlobalMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()") public Result getGlobalMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 地图数据 - List GlobalTempMapVoList = negativeMapper.getGlobalMap(beginTime, endTime); - JSONObject data = new JSONObject().fluentPut("globalTempMapVoList", GlobalTempMapVoList); + List list = negativeMapper.getGlobalMap(beginTime, endTime); + JSONObject data = new JSONObject().fluentPut("globalTempMapVoList", list); return Result.success(data); } diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java index 28eedb8..f393867 100644 --- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java +++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java @@ -1,6 +1,7 @@ package com.biutag.supervision.controller.work; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -52,6 +53,7 @@ public class ConfinementController { * */ @GetMapping public Result> list(ConfinementQueryParam param) { + return Result.success(confinementService.page(param)); } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index fae89ce..010096d 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -52,7 +52,8 @@ public interface NegativeMapper extends BaseMapper { // 中央总览 @Select("SELECT " + "count(ng.id) AS totalPro, " + - "COALESCE(SUM(IF(problemSourcesCode IN (13,14,15,16), 1, 0)), 0) AS supervisionPro, " + + "COALESCE(SUM(IF(problemSourcesCode IN (13), 1, 0)), 0) AS supervisionPro, " + + "COALESCE(SUM(IF(problemSourcesCode IN (14,15,16), 1, 0)), 0) AS numSupervisionPro, " + "COALESCE(SUM(IF(problemSourcesCode IN (17,18,19,20), 1, 0)), 0) AS caseVerificationPro, " + // "COALESCE(SUM(IF(problemSourcesCode IN (27,28,29,30), 1, 0)), 0) AS auditPro, " + "COALESCE(SUM(IF(problemSourcesCode IN (2), 1, 0)), 0) AS talkPro " + @@ -66,14 +67,15 @@ public interface NegativeMapper extends BaseMapper { "sd.short_name AS `name`, " + "sd.id AS departId, " + "COUNT( DISTINCT ng.id ) AS totalPro, " + - "SUM( IF(problemSourcesCode IN (13,15,16, 14), 1, 0) ) AS supervisePro, " + + "SUM( IF(problemSourcesCode IN (13), 1, 0) ) AS supervisePro, " + + "SUM( IF(problemSourcesCode IN (15,16, 14), 1, 0) ) as numSupervisePro, " + "SUM( IF(problemSourcesCode IN (17,18,19,20), 1, 0) ) AS caseVerifyPro, " + "SUM( IF(problemSourcesCode IN (21,22,23,24,25),1, 0) ) AS mailPro, " + "SUM( IF(problemSourcesCode IN (2),1, 0) ) AS policePro, " + "SUM( IF(problemSourcesCode IN (27,28,29,30),1, 0) ) AS reviewPro " + "FROM sup_depart sd " + "LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id " + - "AND problemSourcesCode IN (2,13,15,16,17,18,19,20,21,22,23,24,25,27,28,29,30) " + + "AND ng.crtTime BETWEEN #{beginTime} AND #{endTime} " + "WHERE sd.statistics_group_id=3 " + "GROUP BY sd.short_name " + diff --git a/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java b/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java index 05b3908..24971a7 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java @@ -13,14 +13,12 @@ import java.io.Serializable; * @Description: 首页数据大屏地图悬浮图标VO */ @Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class GlobalMapIconVo implements Serializable { +public class GlobalMapIconVo { private String name; // 分县市局名称 private Integer totalPro; // 总问题 private Integer supervisePro; // 督察问题 + private Integer numSupervisePro; private Integer caseVerifyPro; // 案件核查问题 private Integer mailPro; // 信访投诉问题 private Integer policePro; // 警务评议问题 diff --git a/src/main/java/com/biutag/supervision/pojo/vo/GlobalOverViewVo.java b/src/main/java/com/biutag/supervision/pojo/vo/GlobalOverViewVo.java index 61375b6..9f7709f 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/GlobalOverViewVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/GlobalOverViewVo.java @@ -9,11 +9,22 @@ import lombok.Data; */ @Data public class GlobalOverViewVo { + //现场督查 Long supervisionPro; + + //数字督查（14,15,16） + Long numSupervisionPro; + + + //案件核查 Long caseVerificationPro; + //信访投诉 Long complaintPro; - Long talkPro; // 民意感知 + // 民意感知 + Long talkPro; + // Long auditPro; + //总数 Long totalPro; private Long mailboxNumber; diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java index 812763c..1961294 100644 --- a/src/main/java/com/biutag/supervision/service/ConfinementService.java +++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java @@ -1,5 +1,6 @@ package com.biutag.supervision.service; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -47,6 +48,7 @@ public class ConfinementService extends ServiceImpl orgIds = departService.getAllNodeIds(user.getAuthDepartIds()); queryWrapper.in("c1.org_id", orgIds); } + //查询条件：姓名、部门、事由、禁闭时间（大于或者等于开始时间，小于或者等于结束时间） queryWrapper.like(StrUtil.isNotBlank(param.getName()), "c1.name", StrUtil.trim(param.getName())) .or().like(StrUtil.isNotBlank(param.getMatter()), "c1.matter", StrUtil.trim(param.getMatter()));