恢复火灾趋势接口代码

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -675,16 +675,11 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             }
         }
         QueryWrapper<DemFireStatistics> query = Wrappers.query();
-        // query.select("MONTH (fire_time) monthTime", "COUNT(1) AS aCount")
-        //         .like(StringUtils.isNotBlank(address), "fire_address", address)
-        //         .in(CollectionUtils.isNotEmpty(fireNumberList), "fire_number", fireNumberList)
-        //         .between(startTime != null && endTime != null, "fire_time", startTime, endTime)
-        //         .groupBy("monthTime");
-        query.select("MONTH(fire_time) AS monthTime", "COUNT(1) AS aCount")
+        query.select("MONTH (fire_time) monthTime", "COUNT(1) AS aCount")
                 .like(StringUtils.isNotBlank(address), "fire_address", address)
                 .in(CollectionUtils.isNotEmpty(fireNumberList), "fire_number", fireNumberList)
                 .between(startTime != null && endTime != null, "fire_time", startTime, endTime)
-                .groupBy("MONTH(fire_time)");
+                .groupBy("monthTime");
         List<Map<String, Object>> list = this.listMaps(query);
         List<Object> avgList = new ArrayList<>();
         for (int i = 1; i <= 12; i++) {