Browse Source

fix: 优化单位/个人画像

master
wxc 4 months ago
parent
commit
d7f11209f7
  1. 2
      src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java
  2. 4
      src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java
  3. 2
      src/main/java/com/biutag/supervision/job/DepartJob.java
  4. 2
      src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java
  5. 2
      src/main/resources/mapper/ProfileDepartMapper.xml
  6. 2
      src/main/resources/mapper/ProfilePoliceMapper.xml

2
src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java

@ -145,6 +145,8 @@ public class ProfileDepartController {
return radarIndicatorItem; return radarIndicatorItem;
}).toList(); }).toList();
profileDepart.setProblemTypeRadarIndicator(problemTypeRadarIndicator); profileDepart.setProblemTypeRadarIndicator(problemTypeRadarIndicator);
List<Integer> problemTypeRadarData = problemTypeList.stream().map(item -> item.getValue().intValue()).toList();
profileDepart.setProblemTypeRadarData(problemTypeRadarData);
// 突出问题排名 // 突出问题排名
List<NegativeProblemRelation> negativeProblemRelations = negativeProblemRelationService.list(new LambdaQueryWrapper<NegativeProblemRelation>().in(NegativeProblemRelation::getNegativeId, negativeIds)); List<NegativeProblemRelation> negativeProblemRelations = negativeProblemRelationService.list(new LambdaQueryWrapper<NegativeProblemRelation>().in(NegativeProblemRelation::getNegativeId, negativeIds));

4
src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java

@ -50,7 +50,7 @@ public class ScoreController {
public Result<String> updatePoliceScore() { public Result<String> updatePoliceScore() {
List<SupPolice> supPolices = policeScoreMapper.listPolice(); List<SupPolice> supPolices = policeScoreMapper.listPolice();
Date endTime = new Date(); Date endTime = new Date();
LocalDateTime localDateTime = LocalDateTime.of(2024, 1, 1, 0, 0, 0); LocalDateTime localDateTime = LocalDateTime.now().minusYears(1);
Date beginTime = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); Date beginTime = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
supPolices.forEach(item -> { supPolices.forEach(item -> {
List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode()); List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode());
@ -70,7 +70,7 @@ public class ScoreController {
public Result<String> updateDepartScore() { public Result<String> updateDepartScore() {
List<SupDepart> supDeparts = departScoreMapper.listDepart(); List<SupDepart> supDeparts = departScoreMapper.listDepart();
Date endTime = new Date(); Date endTime = new Date();
LocalDateTime localDateTime = LocalDateTime.of(2024, 1, 1, 0, 0, 0); LocalDateTime localDateTime = LocalDateTime.now().minusYears(1);
Date beginTime = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); Date beginTime = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
supDeparts.forEach(item -> { supDeparts.forEach(item -> {
List<Object> result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getId()); List<Object> result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getId());

2
src/main/java/com/biutag/supervision/job/DepartJob.java

@ -56,7 +56,7 @@ public class DepartJob {
/** /**
* 每月1号零点更新 * 每月1号零点更新
*/ */
//@Scheduled(cron = "0 0 1 * * ?") @Scheduled(cron = "0 0 1 * * ?")
// @PostConstruct // @PostConstruct
public void updateDepartNegativeRate() { public void updateDepartNegativeRate() {
// 10 派出所 // 10 派出所

2
src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java

@ -33,6 +33,8 @@ public class ProfileDepart {
// 雷达图 // 雷达图
private List<RadarIndicatorItem> problemTypeRadarIndicator = new ArrayList<>(); private List<RadarIndicatorItem> problemTypeRadarIndicator = new ArrayList<>();
private List<Integer> problemTypeRadarData = new ArrayList<>();
private List<Integer> scoreRadarData = new ArrayList<>(); private List<Integer> scoreRadarData = new ArrayList<>();
// 个人问题排名 // 个人问题排名
private List<BarItem> policeBarList = new ArrayList<>(); private List<BarItem> policeBarList = new ArrayList<>();

2
src/main/resources/mapper/ProfileDepartMapper.xml

@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.parent_depart_name, d.parent_depart_name,
d.depart_name d.depart_name
ORDER BY ORDER BY
score DESC verify_size DESC, score desc
</select> </select>
<select id="selectPoliceNegativeCount" resultType="com.biutag.supervision.pojo.dto.common.BarItem"> <select id="selectPoliceNegativeCount" resultType="com.biutag.supervision.pojo.dto.common.BarItem">

2
src/main/resources/mapper/ProfilePoliceMapper.xml

@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d1.short_name, d1.short_name,
pc.score pc.score
ORDER BY ORDER BY
pc.score desc verify_size desc, score desc
</select> </select>
<select id="selectProblemType" resultType="com.biutag.supervision.pojo.dto.common.BarItem"> <select id="selectProblemType" resultType="com.biutag.supervision.pojo.dto.common.BarItem">

Loading…
Cancel
Save