diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java index 2ffa819..1ae6b6e 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java @@ -145,6 +145,8 @@ public class ProfileDepartController { return radarIndicatorItem; }).toList(); profileDepart.setProblemTypeRadarIndicator(problemTypeRadarIndicator); + List problemTypeRadarData = problemTypeList.stream().map(item -> item.getValue().intValue()).toList(); + profileDepart.setProblemTypeRadarData(problemTypeRadarData); // 突出问题排名 List negativeProblemRelations = negativeProblemRelationService.list(new LambdaQueryWrapper().in(NegativeProblemRelation::getNegativeId, negativeIds)); diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java index 8c7b6a1..c438b55 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ScoreController.java @@ -50,7 +50,7 @@ public class ScoreController { public Result updatePoliceScore() { List supPolices = policeScoreMapper.listPolice(); 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()); supPolices.forEach(item -> { List result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode()); @@ -70,7 +70,7 @@ public class ScoreController { public Result updateDepartScore() { List supDeparts = departScoreMapper.listDepart(); 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()); supDeparts.forEach(item -> { List result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getId()); diff --git a/src/main/java/com/biutag/supervision/job/DepartJob.java b/src/main/java/com/biutag/supervision/job/DepartJob.java index 067ff37..aea5c4f 100644 --- a/src/main/java/com/biutag/supervision/job/DepartJob.java +++ b/src/main/java/com/biutag/supervision/job/DepartJob.java @@ -56,7 +56,7 @@ public class DepartJob { /** * 每月1号零点更新 */ - //@Scheduled(cron = "0 0 1 * * ?") + @Scheduled(cron = "0 0 1 * * ?") // @PostConstruct public void updateDepartNegativeRate() { // 10 派出所 diff --git a/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java b/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java index 20bf687..75f1e8c 100644 --- a/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java +++ b/src/main/java/com/biutag/supervision/pojo/domain/ProfileDepart.java @@ -33,6 +33,8 @@ public class ProfileDepart { // 雷达图 private List problemTypeRadarIndicator = new ArrayList<>(); + private List problemTypeRadarData = new ArrayList<>(); + private List scoreRadarData = new ArrayList<>(); // 个人问题排名 private List policeBarList = new ArrayList<>(); diff --git a/src/main/resources/mapper/ProfileDepartMapper.xml b/src/main/resources/mapper/ProfileDepartMapper.xml index 6f7e5fd..4053e72 100644 --- a/src/main/resources/mapper/ProfileDepartMapper.xml +++ b/src/main/resources/mapper/ProfileDepartMapper.xml @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.parent_depart_name, d.depart_name ORDER BY - score DESC + verify_size DESC, score desc