diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java index cf3244c..b8d21fe 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java @@ -119,15 +119,13 @@ public class DataGobalController { /** - * 数据大屏问题趋势统计(按月) - * + * 数据大屏问题趋势统计(按月展示) * @param year * @return */ @Operation(summary = "数据大屏问题趋势统计(按月)") @GetMapping("/getGobalRecentlyTrendByMonth") public Result getGobalRecentlyTrendByMonth(@RequestParam Integer year) { - List recentTrendVoList = dataGobalService.getGobalRecentlyTrendByMonth(String.valueOf(year)); ArrayList monthList = new ArrayList<>(); ArrayList totalList = new ArrayList<>(); diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 7997c9d..750a8a4 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -36,7 +36,7 @@ public interface NegativeMapper extends BaseMapper { List selectBusinessRate(Date beginTime,Date endTime); - @Select("SELECT DATE_FORMAT(ng.crtTime, '%Y-%m') AS monthTime, COUNT(*) total FROM negative ng " + + @Select("SELECT DATE_FORMAT(ng.discoveryTime, '%Y-%m') AS monthTime, COUNT(*) total FROM negative ng " + "WHERE YEAR(ng.discoveryTime)=#{year} and checkStatus=1 " + "GROUP BY monthTime " + "order BY monthTime asc") diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java index 7097cde..2d20b21 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java @@ -19,14 +19,12 @@ public interface NegativeProblemRelationMapper extends BaseMapper selectProblemRate(Date beginTime, Date endTime); - @Select("SELECT (@row_number := @row_number + 1) AS sort, sorted_results.label, sorted_results.value " + - "FROM " + - "(SELECT npr.threeLevelContent AS label, COUNT(*) AS value " + - "FROM negative_problem_relation npr " + - "WHERE npr.threeLevelContent IS NOT NULL " + - "GROUP BY label " + - "ORDER BY value DESC) " + - "AS sorted_results, (SELECT @row_number := 0) AS t;") + @Select("SELECT threeLevelContent as name, count(*) as `value` " + + "FROM negative_problem_relation " + + "WHERE negativeId " + + "in ( SELECT id FROM negative WHERE discoveryTime BETWEEN #{beginTime} AND #{endTime}) " + + "GROUP BY threeLevelContent " + + "ORDER BY VALUE DESC ") List selectStrongProblemRank(Date beginTime, Date endTime); @Select("SELECT sd1.short_name, count(*) value " + diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java index 740b102..4641512 100644 --- a/src/main/java/com/biutag/supervision/service/DataGobalService.java +++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java @@ -132,6 +132,9 @@ public class DataGobalService { * @return */ public List getStrongProblemRank(Date beginTime, Date endTime) { + // 1.获取这段时间的negative id + // + List res= negativeProblemRelationMapper.selectStrongProblemRank(beginTime, endTime); return res; }