|
|
|
@ -2,25 +2,26 @@ package com.biutag.supervision.controller.datav; |
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.biutag.supervision.constants.enums.ProblemSourcesEnum; |
|
|
|
|
|
|
|
import com.biutag.supervision.constants.enums.RepeatEnum; |
|
|
|
|
|
|
|
import com.biutag.supervision.mapper.DataPetition12337Mapper; |
|
|
|
import com.biutag.supervision.mapper.DataPetition12337Mapper; |
|
|
|
import com.biutag.supervision.mapper.DataPetitionComplaintMapper; |
|
|
|
|
|
|
|
import com.biutag.supervision.mapper.NegativeBlameMapper; |
|
|
|
import com.biutag.supervision.mapper.NegativeBlameMapper; |
|
|
|
import com.biutag.supervision.mapper.NegativeMapper; |
|
|
|
import com.biutag.supervision.mapper.NegativeMapper; |
|
|
|
import com.biutag.supervision.pojo.Result; |
|
|
|
import com.biutag.supervision.pojo.Result; |
|
|
|
import com.biutag.supervision.pojo.vo.*; |
|
|
|
import com.biutag.supervision.pojo.request.datav.DataVRequest; |
|
|
|
|
|
|
|
import com.biutag.supervision.pojo.vo.BlameStats; |
|
|
|
|
|
|
|
import com.biutag.supervision.pojo.vo.EchartsVo; |
|
|
|
|
|
|
|
import com.biutag.supervision.pojo.vo.MailMapIconVo; |
|
|
|
import com.biutag.supervision.service.DataMailService; |
|
|
|
import com.biutag.supervision.service.DataMailService; |
|
|
|
|
|
|
|
import com.biutag.supervision.service.datav.DatavService; |
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag; |
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
@ -35,78 +36,34 @@ import java.util.*; |
|
|
|
public class DataVMailViewController { |
|
|
|
public class DataVMailViewController { |
|
|
|
|
|
|
|
|
|
|
|
private final DataMailService dataMailService; |
|
|
|
private final DataMailService dataMailService; |
|
|
|
private final DataPetitionComplaintMapper dataPetitionComplaintMapper; |
|
|
|
|
|
|
|
private final DataPetition12337Mapper dataPetition12337Mapper; |
|
|
|
private final DataPetition12337Mapper dataPetition12337Mapper; |
|
|
|
private final NegativeMapper negativeMapper; |
|
|
|
private final NegativeMapper negativeMapper; |
|
|
|
private final NegativeBlameMapper negativeBlameMapper; |
|
|
|
private final NegativeBlameMapper negativeBlameMapper; |
|
|
|
// region 左边
|
|
|
|
private final DatavService datavService; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
// region 左边
|
|
|
|
* 初访重访情况 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param beginTime 开始时间 |
|
|
|
|
|
|
|
* @param endTime 结束时间 |
|
|
|
|
|
|
|
* @return Result<JSONObject> |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@Operation(summary = "初访重访情况") |
|
|
|
@Operation(summary = "初访重访情况") |
|
|
|
@GetMapping("/getFirstAndRepeatMail") |
|
|
|
@PostMapping("/getFirstAndRepeatMail") |
|
|
|
public Result<JSONObject> getFirstAndRepeatMail(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
public Result<JSONObject> getFirstAndRepeatMail(@RequestBody DataVRequest request) { |
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
return datavService.getFirstAndRepeatMail(request); |
|
|
|
endTime = DateUtil.endOfDay(endTime); |
|
|
|
} |
|
|
|
//查询条件国家信访和公安部信访
|
|
|
|
|
|
|
|
List<String> codes = List.of(ProblemSourcesEnum.GJXFPT.getValue(),ProblemSourcesEnum.GABXF.getValue()); |
|
|
|
|
|
|
|
// 初访重访情况总览
|
|
|
|
@Operation(summary = "信访投诉占比") |
|
|
|
MailFirstAndRepeatOverviewVo fxjsFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 3,codes); |
|
|
|
@PostMapping("/getComplaintRate") |
|
|
|
MailFirstAndRepeatOverviewVo bwzdFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 4,codes); |
|
|
|
public Result<JSONObject> getComplaintRate(@RequestBody DataVRequest request) { |
|
|
|
|
|
|
|
return datavService.getAllMailCount(request); |
|
|
|
//未知数据
|
|
|
|
|
|
|
|
int nullNumber = dataPetitionComplaintMapper.getNullObjectData(beginTime, endTime, codes); |
|
|
|
|
|
|
|
// fxjsFirstAndRepeatOverview.setFirstMail(fxjsFirstAndRepeatOverview.getFirstMail() + nullNumber);
|
|
|
|
|
|
|
|
// 初访重访分类数据排行
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjFirstRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.FIRST_MAIL.getId(),codes); // 1
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjRepeatRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.REPEAT_MAIL.getId(),codes); // 2
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjLeaderViewRankList = dataPetitionComplaintMapper.getMailLeaderRank(beginTime, endTime, 3,codes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdFirstRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 4, RepeatEnum.FIRST_MAIL.getId(),codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdRepeatRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 4, RepeatEnum.REPEAT_MAIL.getId(),codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdLeaderViewRankList = dataPetitionComplaintMapper.getMailLeaderRank(beginTime, endTime, 4,codes); |
|
|
|
|
|
|
|
JSONObject data = new JSONObject() |
|
|
|
|
|
|
|
.fluentPut("fxjsFirstAndRepeatOverview", fxjsFirstAndRepeatOverview) |
|
|
|
|
|
|
|
.fluentPut("bwzdFirstAndRepeatOverview", bwzdFirstAndRepeatOverview) |
|
|
|
|
|
|
|
.fluentPut("fxsjFirstRankList", fxsjFirstRankList) |
|
|
|
|
|
|
|
.fluentPut("fxsjRepeatRankList", fxsjRepeatRankList) |
|
|
|
|
|
|
|
.fluentPut("fxsjLeaderViewRankList", fxsjLeaderViewRankList) |
|
|
|
|
|
|
|
.fluentPut("bwzdFirstRankList", bwzdFirstRankList) |
|
|
|
|
|
|
|
.fluentPut("bwzdRepeatRankList", bwzdRepeatRankList) |
|
|
|
|
|
|
|
.fluentPut("nullNumber",nullNumber) |
|
|
|
|
|
|
|
.fluentPut("bwzdLeaderViewRankList", bwzdLeaderViewRankList); |
|
|
|
|
|
|
|
return Result.success(data); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
// endregion
|
|
|
|
// endregion
|
|
|
|
|
|
|
|
|
|
|
|
// region 中间
|
|
|
|
// region 中间
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 信访数据中央总览统计 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param beginTime 开始时间 |
|
|
|
|
|
|
|
* @param endTime 结束时间 |
|
|
|
|
|
|
|
* @return Result<JSONObject> |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@Operation(summary = "中央数据统计") |
|
|
|
@Operation(summary = "中央数据统计") |
|
|
|
@GetMapping("/getAllMailCount") |
|
|
|
@PostMapping("/getAllMailCount") |
|
|
|
public Result<JSONObject> getAllMailCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
public Result<JSONObject> getAllMailCount(@RequestBody DataVRequest request) { |
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
return datavService.getAllMailCount(request); |
|
|
|
// 信访数据总数概览
|
|
|
|
|
|
|
|
MailOverviewVo overview = dataMailService.allMailCount(beginTime, DateUtil.endOfDay(endTime)); |
|
|
|
|
|
|
|
System.out.println("信访总览================================"); |
|
|
|
|
|
|
|
System.out.println(overview); |
|
|
|
|
|
|
|
// MailOverviewVo overview = dataMailService.getAllMailCount(beginTime, endTime);
|
|
|
|
|
|
|
|
JSONObject data = new JSONObject().fluentPut("overview", overview); |
|
|
|
|
|
|
|
return Result.success(data); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 信访数据中央地图小图标数据 |
|
|
|
* 信访数据中央地图小图标数据 |
|
|
|
* |
|
|
|
* |
|
|
|
@ -149,42 +106,10 @@ public class DataVMailViewController { |
|
|
|
// endregion
|
|
|
|
// endregion
|
|
|
|
|
|
|
|
|
|
|
|
// region 右边
|
|
|
|
// region 右边
|
|
|
|
|
|
|
|
@Operation(summary = "群众集访情况") |
|
|
|
/** |
|
|
|
@PostMapping("/getEntanglementAndMassMail") |
|
|
|
* 缠访集访情况 |
|
|
|
public Result<JSONObject> getEntanglementAndMassMail(@RequestBody DataVRequest request) { |
|
|
|
* |
|
|
|
return datavService.getEntanglementAndMassMail(request); |
|
|
|
* @param beginTime 开始时间 |
|
|
|
|
|
|
|
* @param endTime 结束时间 |
|
|
|
|
|
|
|
* @return Result<JSONObject> |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
@Operation(summary = "缠访集访情况") |
|
|
|
|
|
|
|
@GetMapping("/getEntanglementAndMassMail") |
|
|
|
|
|
|
|
public Result<JSONObject> getEntanglementAndMassMail(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, |
|
|
|
|
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
|
|
|
|
//查询国家信访和公安部信访
|
|
|
|
|
|
|
|
List<String> codes = List.of(ProblemSourcesEnum.GJXFPT.getValue(),ProblemSourcesEnum.GABXF.getValue()); |
|
|
|
|
|
|
|
// 缠访集访情况总览
|
|
|
|
|
|
|
|
MailEntanglementMassOverviewVo fxsjMailEntanglementMassOverview = dataPetitionComplaintMapper.getEntanglementAndMassOverview(beginTime, endTime, 3,codes); |
|
|
|
|
|
|
|
MailEntanglementMassOverviewVo bwzdMailEntanglementMassOverview = dataPetitionComplaintMapper.getEntanglementAndMassOverview(beginTime, endTime, 4,codes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjLeaderReviewList = dataPetitionComplaintMapper.getMailLeaderRank(beginTime, endTime, 3,codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjEntanglementList = dataPetitionComplaintMapper.getEntanglementMailRank(beginTime, endTime, 3,codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> fxsjMassList = dataPetitionComplaintMapper.getMassMailRank(beginTime, endTime, 3,codes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdLeaderReviewList = dataPetitionComplaintMapper.getMailLeaderRank(beginTime, endTime, 4,codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdEntanglementList = dataPetitionComplaintMapper.getEntanglementMailRank(beginTime, endTime, 4,codes); |
|
|
|
|
|
|
|
List<OrganizeProblemRankVo> bwzdMassList = dataPetitionComplaintMapper.getMassMailRank(beginTime, endTime, 4,codes); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject data = new JSONObject() |
|
|
|
|
|
|
|
.fluentPut("fxsjMailEntanglementMassOverview", fxsjMailEntanglementMassOverview) |
|
|
|
|
|
|
|
.fluentPut("bwzdMailEntanglementMassOverview", bwzdMailEntanglementMassOverview) |
|
|
|
|
|
|
|
.fluentPut("fxsjLeaderReviewList", fxsjLeaderReviewList) |
|
|
|
|
|
|
|
.fluentPut("fxsjEntanglementList", fxsjEntanglementList) |
|
|
|
|
|
|
|
.fluentPut("fxsjMassList", fxsjMassList) |
|
|
|
|
|
|
|
.fluentPut("bwzdLeaderReviewList", bwzdLeaderReviewList) |
|
|
|
|
|
|
|
.fluentPut("bwzdEntanglementList", bwzdEntanglementList) |
|
|
|
|
|
|
|
.fluentPut("bwzdMassList", bwzdMassList); |
|
|
|
|
|
|
|
return Result.success(data); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
|