supervision
/
supervision-boot
4
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

main
kami 1 year ago
parent
a3a19f8a7f adfedb1cb6
commit
94c73debc7
9 changed files with 172 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java
  2. 1
      src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java
  3. 65
      src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
  4. 5
      src/main/java/com/biutag/supervision/mapper/SupDepartMapper.java
  5. 4
      src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java
  6. 3
      src/main/java/com/biutag/supervision/pojo/vo/GobalMapIconVo.java
  7. 66
      src/main/java/com/biutag/supervision/service/DataGobalService.java
  8. 13
      src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
  9. 41
      src/main/java/com/biutag/supervision/service/ModelClueService.java

45
src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java
Unescape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.pojo.vo.*;
import com.biutag.supervision.service.DataGobalService; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.activation.DataHandler; import jakarta.activation.DataHandler;
@ -35,6 +36,7 @@ public class DataGobalController {
private final DataGobalService dataGobalService; private final DataGobalService dataGobalService;
/** /**
* 获取数据大屏概览 * 获取数据大屏概览
* @param beginTime * @param beginTime
@ -61,48 +63,22 @@ public class DataGobalController {
// 突出问题排名 // 突出问题排名
List<StrongProblemRank> tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime); List<StrongProblemRank> tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime);
// 地图显示结果
List<GobalMapIconVo> gobalMapVoList = new ArrayList<>(); // 查所有的市局
fxsjlist.forEach(item -> { List<GobalMapIconVo> gobalTempMapVoList = dataGobalService.getMapIconInfo(beginTime, endTime);
// 添加总数 if ( gobalTempMapVoList==null || gobalTempMapVoList.size() == 0) {
GobalMapIconVo gobalMapVo = new GobalMapIconVo(); gobalTempMapVoList = new ArrayList<>();
gobalMapVo.setName(item.getLabel());
gobalMapVo.setTotalPro(Integer.parseInt(item.getValue()));
gobalMapVoList.add(gobalMapVo);
});
// 市县分局的督察问题
List<CommonVo> superviseProList = dataGobalService.getSuperviseProTotal(beginTime, endTime);
List<CommonVo> caseVerifyProList = dataGobalService.getCaseVerifyProTotal(beginTime, endTime);
List<CommonVo> mailProList = dataGobalService.getMailProTotal(beginTime, endTime);
List<CommonVo> policeProList = dataGobalService.getPoliceProTotal(beginTime, endTime);
List<CommonVo> reviewProList = dataGobalService.getReviewProTotal(beginTime, endTime);
List<GobalMapIconVo> gobalTempMapVoList = new ArrayList<>();
if (!gobalMapVoList.isEmpty()) {
updateProList(superviseProList, gobalMapVoList, GobalMapIconVo::setSupervisePro);
updateProList(caseVerifyProList, gobalMapVoList, GobalMapIconVo::setCaseVerifyPro);
updateProList(mailProList, gobalMapVoList, GobalMapIconVo::setMailPro);
updateProList(policeProList, gobalMapVoList, GobalMapIconVo::setPolicePro);
updateProList(reviewProList, gobalMapVoList, GobalMapIconVo::setReviewPro);
}else {
// gobalTempMapVoList.add(new GobalMapIconVo("芙蓉分局", 1,11,11,11,11,11));
// gobalTempMapVoList.add(new GobalMapIconVo("天心分局", 2,22,22,22,22,22));
// gobalTempMapVoList.add(new GobalMapIconVo("岳麓分局", 3,33,33,33,33,33));
// gobalTempMapVoList.add(new GobalMapIconVo("开福分局", 4,44,44,44,44,44));
// gobalTempMapVoList.add(new GobalMapIconVo("雨花分局", 5,55,55,55,55,55));
// gobalTempMapVoList.add(new GobalMapIconVo("长沙县局", 6,66,66,66,66,66));
// gobalTempMapVoList.add(new GobalMapIconVo("望城分局", 7,77,77,77,77,77));
// gobalTempMapVoList.add(new GobalMapIconVo("宁乡市局", 8,88,88,88,88,88));
// gobalTempMapVoList.add(new GobalMapIconVo("浏阳市局", 9,99,99,99,99,99));
} }
JSONObject data = new JSONObject().fluentPut("overview", overview) JSONObject data = new JSONObject().fluentPut("overview", overview)
.fluentPut("fxsjlist", fxsjlist) .fluentPut("fxsjlist", fxsjlist)
.fluentPut("jsdwlist", jsdwlist) .fluentPut("jsdwlist", jsdwlist)
.fluentPut("ywzblist", ywzblist) .fluentPut("ywzblist", ywzblist)
.fluentPut("wtlxlist", wtlxlist) .fluentPut("wtlxlist", wtlxlist)
.fluentPut("tcwtlist", tcwtlist) .fluentPut("tcwtlist", tcwtlist)
.fluentPut("gobalMapVoList", gobalMapVoList)
.fluentPut("gobalTempMapVoList", gobalTempMapVoList); .fluentPut("gobalTempMapVoList", gobalTempMapVoList);
return Result.success(data); return Result.success(data);
} }
@ -165,4 +141,7 @@ public class DataGobalController {
return Result.success(jsonObject); return Result.success(jsonObject);
} }
} }

1
src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java
Unescape View File

@ -49,7 +49,6 @@ public class SupervisionNotifyController {
/** /**
* 获取日常督察排行 * 获取日常督察排行
*
* @param groupType 分组类型 1: 分县市局 2: 局属单位 * @param groupType 分组类型 1: 分县市局 2: 局属单位
* @return * @return
*/ */

65
src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
Unescape View File

@ -92,6 +92,9 @@ public interface NegativeMapper extends BaseMapper<Negative> {
Long selectRelationOrgCount(Date beginTime, Date endTime, String checkStatus); Long selectRelationOrgCount(Date beginTime, Date endTime, String checkStatus);
/**
* 获取现场督察按二级机构分组划分的问题数
*/
@Select("SELECT COUNT(*) FROM negative n " + @Select("SELECT COUNT(*) FROM negative n " +
"INNER JOIN ( " + "INNER JOIN ( " +
" SELECT DISTINCT sd.id " + " SELECT DISTINCT sd.id " +
@ -100,10 +103,15 @@ public interface NegativeMapper extends BaseMapper<Negative> {
" WHERE sd1.statistics_group_id = #{groupType}" + " WHERE sd1.statistics_group_id = #{groupType}" +
") AS filtered_sd ON n.involveDepartId = filtered_sd.id " + ") AS filtered_sd ON n.involveDepartId = filtered_sd.id " +
"WHERE n.checkStatus = 1 " + "WHERE n.checkStatus = 1 " +
"AND n.problemSourcesCode = 15;") "AND n.problemSourcesCode = 15 " +
"AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Long getCountByGroupType(Integer groupType, Date beginTime, Date endTime); Long getCountByGroupType(Integer groupType, Date beginTime, Date endTime);
/**
* 获取现场督察按二级机构分组和整改状态划分的的问题数
*/
@Select("SELECT COUNT(*) FROM negative n " + @Select("SELECT COUNT(*) FROM negative n " +
"INNER JOIN ( " + "INNER JOIN ( " +
" SELECT DISTINCT sd.id " + " SELECT DISTINCT sd.id " +
@ -117,7 +125,60 @@ public interface NegativeMapper extends BaseMapper<Negative> {
"AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}") "AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Long getChangCountByGroupType(Integer groupType, Date beginTime, Date endTime, Integer isRectify); Long getChangCountByGroupType(Integer groupType, Date beginTime, Date endTime, Integer isRectify);
@Select("SELECT count(*) FROM negative ng INNER JOIN " +
" (" +
" SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " +
" INNER join sup_depart sd1 on sd.pid=sd1.id " +
" and sd1.LEVEL=2 AND sd1.statistics_group_id=3" +
" ) " +
"as temp on ng.involveDepartId=temp.id " +
"AND ng.checkStatus<>3 AND problemSourcesCode in (13, 15, 16) " +
"AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Integer seleGobalMapIconInfoDc(Date beginTime, Date endTime, Integer departId);
@Select("SELECT count(*) FROM negative ng INNER JOIN " +
" (" +
" SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " +
" INNER join sup_depart sd1 on sd.pid=sd1.id " +
" and sd1.LEVEL=2 AND sd1.statistics_group_id=3" +
" ) " +
"as temp on ng.involveDepartId=temp.id " +
"AND ng.checkStatus<>3 AND problemSourcesCode=11 " +
"AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Integer seleGobalMapIconInfoAjhc(Date beginTime, Date endTime, Integer departId);
@Select("SELECT count(*) FROM negative ng INNER JOIN " +
" (" +
" SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " +
" INNER join sup_depart sd1 on sd.pid=sd1.id " +
" and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
" ) " +
"as temp on ng.involveDepartId=temp.id " +
"AND ng.checkStatus<>3 AND problemSourcesCode in (21, 22, 23, 24, 25) " +
"AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Integer seleGobalMapIconInfoXf(Date beginTime, Date endTime, Integer departId);
@Select("SELECT count(*) FROM negative ng INNER JOIN " +
" (" +
" SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " +
" INNER join sup_depart sd1 on sd.pid=sd1.id " +
" and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
" ) " +
"as temp on ng.involveDepartId=temp.id " +
"AND ng.checkStatus<>3 AND problemSourcesCode=2 " +
"AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Integer seleGobalMapIconInfoJwpy(Date beginTime, Date endTime, Integer departId);
@Select("SELECT count(*) FROM negative ng INNER JOIN " +
" (" +
" SELECT sd.id, sd.pid, sd.name, sd1.short_name FROM sup_depart sd " +
" INNER join sup_depart sd1 on sd.pid=sd1.id " +
" and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
" ) " +
"as temp on ng.involveDepartId=temp.id " +
"AND ng.checkStatus<>3 AND problemSourcesCode=26 " +
"AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
Integer seleGobalMapIconInfoSjdc(Date beginTime, Date endTime, Integer departId);
// endregion // endregion
} }

5
src/main/java/com/biutag/supervision/mapper/SupDepartMapper.java
Unescape View File

@ -32,6 +32,11 @@ public interface SupDepartMapper extends BaseMapper<SupDepart> {
List<Map<String, Object>> getIdsByCode(List<String> departIds); List<Map<String, Object>> getIdsByCode(List<String> departIds);
/**
* 按分组查询单位
* @param groupType
* @return
*/
@Select("select * from sup_depart where statistics_group_id = #{groupType} ") @Select("select * from sup_depart where statistics_group_id = #{groupType} ")
List<SupDepart> selectDepartsByGroupType(Integer groupType); List<SupDepart> selectDepartsByGroupType(Integer groupType);
} }

4
src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java
Unescape View File

@ -76,6 +76,10 @@ public class ModelClue {
@TableField(exist = false) @TableField(exist = false)
private Long zjjs; private Long zjjs;
// 104号模型用
@TableField(exist = false)
private Long allZjjs;
// 执法场所登记数 // 执法场所登记数
@TableField(exist = false) @TableField(exist = false)
private Long zfcsdjs; private Long zfcsdjs;

3
src/main/java/com/biutag/supervision/pojo/vo/GobalMapIconVo.java
Unescape View File

@ -1,6 +1,7 @@
package com.biutag.supervision.pojo.vo; package com.biutag.supervision.pojo.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder
public class GobalMapIconVo { public class GobalMapIconVo {
private String name; // 分县市局名称 private String name; // 分县市局名称
@ -21,6 +23,7 @@ public class GobalMapIconVo {
private Integer mailPro; // 信访投诉问题 private Integer mailPro; // 信访投诉问题
private Integer policePro; // 警务评议问题 private Integer policePro; // 警务评议问题
private Integer reviewPro; // 审计监督问题 private Integer reviewPro; // 审计监督问题
private Integer departId; // 分县市局ID
} }

66
src/main/java/com/biutag/supervision/service/DataGobalService.java
Unescape View File

@ -3,18 +3,17 @@ package com.biutag.supervision.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.biutag.supervision.constants.enums.InspectCaseEnum; import com.biutag.supervision.constants.enums.InspectCaseEnum;
import com.biutag.supervision.mapper.DataCaseVerifMapper; import com.biutag.supervision.mapper.*;
import com.biutag.supervision.mapper.DataSupervisionNotifyMapper;
import com.biutag.supervision.mapper.NegativeMapper;
import com.biutag.supervision.mapper.NegativeProblemRelationMapper;
import com.biutag.supervision.pojo.dto.CaseVerifDepart; import com.biutag.supervision.pojo.dto.CaseVerifDepart;
import com.biutag.supervision.pojo.entity.DataCaseVerif; import com.biutag.supervision.pojo.entity.DataCaseVerif;
import com.biutag.supervision.pojo.entity.DataSupervisionNotify; import com.biutag.supervision.pojo.entity.DataSupervisionNotify;
import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.Negative;
import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.pojo.vo.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -31,6 +30,7 @@ public class DataGobalService {
private final NegativeMapper negativeMapper; private final NegativeMapper negativeMapper;
private final NegativeProblemRelationMapper negativeProblemRelationMapper; private final NegativeProblemRelationMapper negativeProblemRelationMapper;
private final SupDepartMapper supDepartMapper;
/** /**
* 获取所有大屏统计数据 * 获取所有大屏统计数据
@ -43,27 +43,27 @@ public class DataGobalService {
// 督察问题数量(查实版本) // 督察问题数量(查实版本)
Long supervisionPro = getCountByConditions( Long supervisionPro = getCountByConditions(
Integer.parseInt(InspectCaseEnum.TRUE.getValue()), Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
beginTime, endTime, beginTime, endTime,
13, 15, 16); 13, 15, 16);
// 获取案件核查问题数量(查实版本) // 获取案件核查问题数量(查实版本)
Long caseVerificationPro = getCountByConditions( Long caseVerificationPro = getCountByConditions(
Integer.parseInt(InspectCaseEnum.TRUE.getValue()), Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
beginTime, endTime, beginTime, endTime,
17, 18, 19, 20); 17, 18, 19, 20);
// 信访投诉问题数量(查实版本) // 信访投诉问题数量(查实版本)
Long complaintPro = getCountByConditions( Long complaintPro = getCountByConditions(
Integer.parseInt(InspectCaseEnum.TRUE.getValue()), Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
beginTime, endTime, beginTime, endTime,
21, 22, 23, 24, 25); 21, 22, 23, 24, 25);
// 警务评议问题数量(查实版本) // 警务评议问题数量(查实版本)
Long reviewPro = getCountByConditions( Long reviewPro = getCountByConditions(
Integer.parseInt(InspectCaseEnum.TRUE.getValue()), Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
beginTime, endTime, beginTime, endTime,
2); 2);
// 审计监督问题数量(查实版本) // 审计监督问题数量(查实版本)
Long auditPro = getCountByConditions( Long auditPro = getCountByConditions(
Integer.parseInt(InspectCaseEnum.TRUE.getValue()), Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
beginTime, endTime, beginTime, endTime,
26); 26);
Long totalPro = caseVerificationPro + supervisionPro + complaintPro + reviewPro + auditPro; Long totalPro = caseVerificationPro + supervisionPro + complaintPro + reviewPro + auditPro;
@ -80,6 +80,7 @@ public class DataGobalService {
/** /**
* 查询核查属实的公共方法 * 查询核查属实的公共方法
*
* @param checkStatus 检查状态 * @param checkStatus 检查状态
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
@ -88,7 +89,7 @@ public class DataGobalService {
*/ */
public Long getCountByConditions(Integer checkStatus, Date startTime, Date endTime, Integer... problemSourcesCodes) { public Long getCountByConditions(Integer checkStatus, Date startTime, Date endTime, Integer... problemSourcesCodes) {
QueryWrapper<Negative> queryWrapper = new QueryWrapper<>(); QueryWrapper<Negative> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("checkStatus", checkStatus) queryWrapper.ne("checkStatus", checkStatus)
.between("discoveryTime", startTime, endTime) .between("discoveryTime", startTime, endTime)
.and(wrapper -> { .and(wrapper -> {
for (int i = 0; i < problemSourcesCodes.length; i++) { for (int i = 0; i < problemSourcesCodes.length; i++) {
@ -107,8 +108,8 @@ public class DataGobalService {
return res; return res;
} }
public List<EchartsVo> getBusinessRate(Date beginTime,Date endTime) { public List<EchartsVo> getBusinessRate(Date beginTime, Date endTime) {
List<EchartsVo> res= negativeMapper.selectBusinessRate(beginTime, endTime); List<EchartsVo> res = negativeMapper.selectBusinessRate(beginTime, endTime);
return res; return res;
} }
@ -119,6 +120,7 @@ public class DataGobalService {
/** /**
* 获取问题类型占比 * 获取问题类型占比
*
* @param beginTime * @param beginTime
* @param endTime * @param endTime
* @return * @return
@ -130,11 +132,12 @@ public class DataGobalService {
/** /**
* 获取突出问题排名 * 获取突出问题排名
*
* @return * @return
*/ */
public List<StrongProblemRank> getStrongProblemRank(Date beginTime, Date endTime) { public List<StrongProblemRank> getStrongProblemRank(Date beginTime, Date endTime) {
// 1.获取这段时间的negative id // 1.获取这段时间的negative id
List<StrongProblemRank> res= negativeProblemRelationMapper.selectStrongProblemRank(beginTime, endTime); List<StrongProblemRank> res = negativeProblemRelationMapper.selectStrongProblemRank(beginTime, endTime);
for (int i = 1; i <= res.size(); i++) { for (int i = 1; i <= res.size(); i++) {
res.get(i - 1).setSort(i); res.get(i - 1).setSort(i);
} }
@ -142,28 +145,55 @@ public class DataGobalService {
} }
public List<CommonVo> getSuperviseProTotal(Date beginTime, Date endTime) { public List<CommonVo> getSuperviseProTotal(Date beginTime, Date endTime) {
List<CommonVo> res= negativeProblemRelationMapper.selectSuperviseProTotal(beginTime, endTime); List<CommonVo> res = negativeProblemRelationMapper.selectSuperviseProTotal(beginTime, endTime);
return res; return res;
} }
public List<CommonVo> getCaseVerifyProTotal(Date beginTime, Date endTime) { public List<CommonVo> getCaseVerifyProTotal(Date beginTime, Date endTime) {
List<CommonVo> res= negativeProblemRelationMapper.selectCaseVerifyProTotal(beginTime, endTime); List<CommonVo> res = negativeProblemRelationMapper.selectCaseVerifyProTotal(beginTime, endTime);
return res; return res;
} }
public List<CommonVo> getMailProTotal(Date beginTime, Date endTime) { public List<CommonVo> getMailProTotal(Date beginTime, Date endTime) {
List<CommonVo> res= negativeProblemRelationMapper.selectMailProTotal(beginTime, endTime); List<CommonVo> res = negativeProblemRelationMapper.selectMailProTotal(beginTime, endTime);
return res; return res;
} }
public List<CommonVo> getPoliceProTotal(Date beginTime, Date endTime) { public List<CommonVo> getPoliceProTotal(Date beginTime, Date endTime) {
List<CommonVo> res= negativeProblemRelationMapper.selectPoliceProTotal(beginTime, endTime); List<CommonVo> res = negativeProblemRelationMapper.selectPoliceProTotal(beginTime, endTime);
return res; return res;
} }
public List<CommonVo> getReviewProTotal(Date beginTime, Date endTime) { public List<CommonVo> getReviewProTotal(Date beginTime, Date endTime) {
List<CommonVo> res= negativeProblemRelationMapper.selectReviewProTotal(beginTime, endTime); List<CommonVo> res = negativeProblemRelationMapper.selectReviewProTotal(beginTime, endTime);
return res;
}
public List<GobalMapIconVo> getMapIconInfo(Date beginTime, Date endTime) {
List<GobalMapIconVo> res = new ArrayList<>();
List<SupDepart> supDeparts = supDepartMapper.selectDepartsByGroupType(3);
for (SupDepart supDepart : supDeparts) {
GobalMapIconVo mapIconVo = new GobalMapIconVo();
mapIconVo.setName(supDepart.getShortName());
mapIconVo.setDepartId(Integer.parseInt(supDepart.getId()));
res.add(mapIconVo);
}
for (GobalMapIconVo re : res) {
Integer departId = re.getDepartId();
Integer supervisePro = negativeMapper.seleGobalMapIconInfoDc(beginTime, endTime, departId);
Integer caseVerifyPro = negativeMapper.seleGobalMapIconInfoAjhc(beginTime, endTime, departId);
Integer mailPro = negativeMapper.seleGobalMapIconInfoXf(beginTime, endTime, departId);
Integer policePro = negativeMapper.seleGobalMapIconInfoJwpy(beginTime, endTime, departId);
Integer reviewPro = negativeMapper.seleGobalMapIconInfoSjdc(beginTime, endTime, departId);
Integer totalPro = supervisePro + caseVerifyPro + mailPro + policePro + reviewPro;
re.setTotalPro(totalPro != null ? totalPro : 0);
re.setSupervisePro(supervisePro != null ? supervisePro : 0);
re.setCaseVerifyPro(caseVerifyPro != null ? caseVerifyPro : 0);
re.setMailPro(mailPro != null ? mailPro : 0);
re.setPolicePro(policePro != null ? policePro : 0);
re.setReviewPro(reviewPro != null ? reviewPro : 0);
}
return res; return res;
} }
} }

13
src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
Unescape View File

@ -69,7 +69,7 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
* 2、查出集合在blame中的涉及人数 * 2、查出集合在blame中的涉及人数
*/ */
QueryWrapper<Negative> preQueryWrapper = new QueryWrapper<>(); QueryWrapper<Negative> preQueryWrapper = new QueryWrapper<>();
preQueryWrapper.eq("problemSourcesCode", ProblemSourcesEnum.XCDC.getValue()); preQueryWrapper.in("problemSourcesCode", ProblemSourcesEnum.XCDC.getValue(), ProblemSourcesEnum.ZXDC.getValue());
List<Negative> negatives = negativeMapper.selectList(preQueryWrapper); List<Negative> negatives = negativeMapper.selectList(preQueryWrapper);
Long supervisionNotifyPreTotal = 0L; Long supervisionNotifyPreTotal = 0L;
@ -81,8 +81,6 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
} }
// 整改率 // 整改率
double correctionRate = supervisionNotifyTotal != 0 ? (supervisionNotifyChangedTotal * 1.0 / supervisionNotifyTotal) * 100 : 0; double correctionRate = supervisionNotifyTotal != 0 ? (supervisionNotifyChangedTotal * 1.0 / supervisionNotifyTotal) * 100 : 0;
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.fluentPut("supervisionNotifyTotal", supervisionNotifyTotal) jsonObject.fluentPut("supervisionNotifyTotal", supervisionNotifyTotal)
.fluentPut("supervisionNotifyOrgTotal", supervisionNotifyOrgTotal) .fluentPut("supervisionNotifyOrgTotal", supervisionNotifyOrgTotal)
@ -119,7 +117,6 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
/** /**
* 获取日常督察整改率排名 * 获取日常督察整改率排名
*
* @param groupType * @param groupType
* @param beginTime * @param beginTime
* @param endTime * @param endTime
@ -127,8 +124,14 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
*/ */
public List<RankVo> getChangedRateRank(Integer groupType, Date beginTime, Date endTime) { public List<RankVo> getChangedRateRank(Integer groupType, Date beginTime, Date endTime) {
List<RankVo> rankVos = new ArrayList<>(); List<RankVo> rankVos = new ArrayList<>();
// 所有部门
List<SupDepart> departs = supDepartMapper.selectDepartsByGroupType(groupType); List<SupDepart> departs = supDepartMapper.selectDepartsByGroupType(groupType);
// negativeMapper.select for (SupDepart depart : departs) {
RankVo rankVo = new RankVo();
rankVo.setLabel(depart.getShortName());
rankVo.setDepartId(depart.getId());
}
return null; return null;

41
src/main/java/com/biutag/supervision/service/ModelClueService.java
Unescape View File

@ -57,6 +57,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
public final SupExternalDepartMapper supExternalDepartMapper; public final SupExternalDepartMapper supExternalDepartMapper;
private final StatisticsDepartMapper statisticsDepartMapper;
public Page<ModelClueModel> page(ModelClueQueryParam param) { public Page<ModelClueModel> page(ModelClueQueryParam param) {
if (Objects.nonNull(param.getModelIds()) && param.getModelIds().isEmpty()) { if (Objects.nonNull(param.getModelIds()) && param.getModelIds().isEmpty()) {
return new Page<ModelClueModel>().setTotal(0).setRecords(new ArrayList<>()); return new Page<ModelClueModel>().setTotal(0).setRecords(new ArrayList<>());
@ -1048,7 +1050,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
private void getModelCluesForModel104(String param, List<ModelClue> modelClues) { private void getModelCluesForModel104(String param, List<ModelClue> modelClues) {
System.out.println("模型104开始查询数据库"); System.out.println("模型104开始查询数据库");
List<String> params = parseSqlForModel2(param); List<String> params = parseSqlForModel2(param);
String sql = "SELECT gxdwdm, gxdwmc, COUNT(*) AS zjjs from dwd_asj_zhtx_jjd where bjsj BETWEEN '" + params.get(0) + " 00:00:00' AND '" + params.get(1) + " 00:00:00' AND jqjb != '04' AND (ysjqxzdm LIKE '01%' OR ysjqxzdm LIKE'02%' OR ysjqxzdm LIKE'06%') AND (bjxldm NOT LIKE '01%' AND bjxldm NOT LIKE '02%' AND bjxldm NOT LIKE '06%') GROUP BY gxdwdm, gxdwmc;"; String sql = "select a.gxdwdm, a.gxdwmc, a.num anum, b.num bnum from ((SELECT gxdwdm, gxdwmc, COUNT(*) AS num from dwd_asj_zhtx_jjd where bjsj BETWEEN '" + params.get(0) + " 00:00:00' AND '" + params.get(1) + " 00:00:00' AND (ysjqxzdm LIKE '01%' OR ysjqxzdm LIKE'02%' OR ysjqxzdm LIKE'06%') AND (bjxldm NOT LIKE '01%' AND bjxldm NOT LIKE '02%' AND bjxldm NOT LIKE '06%') and bjfsdm = '0101' GROUP BY gxdwdm, gxdwmc) a join (SELECT gxdwdm, gxdwmc, COUNT(*) num from dwd_asj_zhtx_jjd where bjsj BETWEEN '" + params.get(0) + " 00:00:00' AND '" + params.get(1) + " 00:00:00' AND (ysjqxzdm LIKE '01%' OR ysjqxzdm LIKE'02%' OR ysjqxzdm LIKE'06%') and bjfsdm = '0101' GROUP BY gxdwdm, gxdwmc) b on a.gxdwdm = b.gxdwdm);";
List<Map<String, Object>> jjdmaps = modelClueDataMapper.selectByUniqueKeys(sql); List<Map<String, Object>> jjdmaps = modelClueDataMapper.selectByUniqueKeys(sql);
System.out.println("模型104查询数据库完毕"); System.out.println("模型104查询数据库完毕");
if (jjdmaps.isEmpty()) { if (jjdmaps.isEmpty()) {
@ -1062,7 +1064,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
modelClue.setData(JSONObject.toJSONString(data)); modelClue.setData(JSONObject.toJSONString(data));
modelClue.setInvolveDepartId(supExternalDepart.getExternalId()); modelClue.setInvolveDepartId(supExternalDepart.getExternalId());
modelClue.setInvolveDepartName(supExternalDepart.getExternalName()); modelClue.setInvolveDepartName(supExternalDepart.getExternalName());
modelClue.setZjjs((Long) data.get("zjjs")); modelClue.setZjjs((Long) data.get("anum"));
modelClue.setAllZjjs((Long)data.get("bnum"));
modelClue.setDepartLevel(supExternalDepart.getLevel()); modelClue.setDepartLevel(supExternalDepart.getLevel());
modelClue.setParentId(supExternalDepart.getPid()); modelClue.setParentId(supExternalDepart.getPid());
modelClue.setThisId(supExternalDepart.getInternalId()); modelClue.setThisId(supExternalDepart.getInternalId());
@ -1072,25 +1075,25 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
List<ModelClue> jjdModelClues3 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 3).toList()); List<ModelClue> jjdModelClues3 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 3).toList());
List<ModelClue> jjdModelClues4 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 4).toList()); List<ModelClue> jjdModelClues4 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 4).toList());
List<ModelClue> jjdModelClues5 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 5).toList()); List<ModelClue> jjdModelClues5 = new ArrayList<>(jjdModelClues.stream().filter(clue -> clue.getDepartLevel() == 5).toList());
mergeModelClues(jjdModelClues5, jjdModelClues4, 1); mergeModelClues(jjdModelClues5, jjdModelClues4, 3);
mergeModelClues(jjdModelClues4, jjdModelClues3, 1); mergeModelClues(jjdModelClues4, jjdModelClues3, 3);
BigDecimal zjjsTotal = BigDecimal.valueOf(jjdModelClues3.stream().mapToLong(ModelClue::getZjjs).sum());
Map<String, BigDecimal> departPercentageMap = new HashMap<>(); Map<String, BigDecimal> departPercentageMap = new HashMap<>();
Map<String, Long> departNumMap = new HashMap<>(); Map<String, Long> departNumMap = new HashMap<>();
Map<String, Long> departAllNumMap = new HashMap<>();
for (ModelClue jjdModelClue : jjdModelClues3) { for (ModelClue jjdModelClue : jjdModelClues3) {
BigDecimal percentage = BigDecimal.valueOf(jjdModelClue.getZjjs()).divide(zjjsTotal, 3, RoundingMode.HALF_UP); BigDecimal percentage = BigDecimal.valueOf(jjdModelClue.getZjjs()).divide(BigDecimal.valueOf(jjdModelClue.getAllZjjs()), 3, RoundingMode.HALF_UP);
departPercentageMap.put(jjdModelClue.getInvolveDepartId(), percentage); departPercentageMap.put(jjdModelClue.getInvolveDepartId(), percentage);
departNumMap.put(jjdModelClue.getInvolveDepartId(), jjdModelClue.getZjjs()); departNumMap.put(jjdModelClue.getInvolveDepartId(), jjdModelClue.getZjjs());
departAllNumMap.put(jjdModelClue.getInvolveDepartId(), jjdModelClue.getAllZjjs());
} }
BigDecimal sumOfPercentages = departPercentageMap.values().stream()
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal avgPercentage = sumOfPercentages.divide(BigDecimal.valueOf(departPercentageMap.size()), 3, RoundingMode.HALF_UP);
BigDecimal multiply = avgPercentage.multiply(new BigDecimal("0.5"));
List<String> highPercentageDepartments = departPercentageMap.entrySet().stream() List<String> highPercentageDepartments = departPercentageMap.entrySet().stream()
.filter(entry -> entry.getValue().compareTo(multiply) > 0) .filter(entry -> entry.getValue().compareTo(BigDecimal.valueOf(0.7)) > 0)
.map(Map.Entry::getKey) .map(Map.Entry::getKey)
.toList(); .toList();
for (String department : highPercentageDepartments) { for (String department : highPercentageDepartments) {
if (departNumMap.get(department) < 10) {
continue;
}
ModelClue newModelClue = new ModelClue(); ModelClue newModelClue = new ModelClue();
newModelClue.setUniqueKey(department); newModelClue.setUniqueKey(department);
newModelClue.setNegativeIdEx(department); newModelClue.setNegativeIdEx(department);
@ -1098,6 +1101,10 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
if (supExternalDepart != null) { if (supExternalDepart != null) {
if (supExternalDepart.getInternalId() != null) { if (supExternalDepart.getInternalId() != null) {
newModelClue.setInvolveDepartId(supExternalDepart.getInternalId()); newModelClue.setInvolveDepartId(supExternalDepart.getInternalId());
StatisticsDepart statisticsDepart = statisticsDepartMapper.selectOne(new QueryWrapper<StatisticsDepart>().eq("departId", supExternalDepart.getInternalId()).last("LIMIT 1"));
if (statisticsDepart == null || statisticsDepart.getLevel() == null || statisticsDepart.getLevel() != 10L) {
continue;
}
} }
if (supExternalDepart.getInternalShortName() != null) { if (supExternalDepart.getInternalShortName() != null) {
newModelClue.setInvolveDepartName(supExternalDepart.getInternalShortName()); newModelClue.setInvolveDepartName(supExternalDepart.getInternalShortName());
@ -1106,10 +1113,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
newModelClue.setDistributionState("0"); newModelClue.setDistributionState("0");
newModelClue.setThingDesc("发现" + newModelClue.getInvolveDepartName() newModelClue.setThingDesc("发现" + newModelClue.getInvolveDepartName()
+ "在" + getDateString(params.get(0)) + "到" + getDateString(params.get(1)) + "在" + getDateString(params.get(0)) + "到" + getDateString(params.get(1))
+ "之间变更了" + departNumMap.get(department) + "个警情的结警性质，占全市的" + "之间共有" + departAllNumMap.get(department) + "个警情，变更了" + departNumMap.get(department)
+ convertToPercentString(departPercentageMap.get(department)) + "，超过了全市单位平均值（" + "个警情的结警性质，超过了该单位总警情的70%，存在大量变更接警性质的异常情况。");
+ convertToPercentString(avgPercentage) + "）的50%（即"
+ convertToPercentString(multiply) + "）以上，存在大量变更接警性质的异常情况。");
newModelClue.setData(newModelClue.getThingDesc()); newModelClue.setData(newModelClue.getThingDesc());
modelClues.add(newModelClue); modelClues.add(newModelClue);
} }
@ -1126,6 +1131,9 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
modelClue1.setZjjs(modelClue2.getZjjs() + modelClue1.getZjjs()); modelClue1.setZjjs(modelClue2.getZjjs() + modelClue1.getZjjs());
} else if (no == 2) { } else if (no == 2) {
modelClue1.setZfcsdjs(modelClue2.getZfcsdjs() + modelClue1.getZfcsdjs()); modelClue1.setZfcsdjs(modelClue2.getZfcsdjs() + modelClue1.getZfcsdjs());
} else if (no == 3) {
modelClue1.setZjjs(modelClue2.getZjjs() + modelClue1.getZjjs());
modelClue1.setAllZjjs(modelClue2.getAllZjjs() + modelClue1.getAllZjjs());
} }
modelClue1.setData(modelClue1.getData() + modelClue2.getData()); modelClue1.setData(modelClue1.getData() + modelClue2.getData());
found = true; found = true;
@ -1146,6 +1154,9 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
newModelClue.setZjjs(modelClue2.getZjjs()); newModelClue.setZjjs(modelClue2.getZjjs());
} else if (no == 2) { } else if (no == 2) {
newModelClue.setZfcsdjs(modelClue2.getZfcsdjs()); newModelClue.setZfcsdjs(modelClue2.getZfcsdjs());
} else if (no == 3) {
newModelClue.setZjjs(modelClue2.getZjjs());
newModelClue.setAllZjjs(modelClue2.getAllZjjs());
} }
modelClues1.add(newModelClue); modelClues1.add(newModelClue);
} else { } else {

Write Preview
Loading…
Cancel
Save