容量、 新增、累计已完成

720yun_fd_manage/gis_application/src/main/resources/application-locSit.properties

@@ -42,8 +42,8 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
-#spring.redis.host=127.0.0.1
-spring.redis.host=120.25.146.52
+spring.redis.host=127.0.0.1
+#spring.redis.host=120.25.146.52
 
 spring.redis.port=6379
 spring.redis.password=

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/ReportServiceImpl.java

@@ -101,7 +101,6 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String dayTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-//        builder.append("select DATE_FORMAT( day, '%Y-%m-%d' ) as groupKey, total as count,  type from tb_report where is_delete=0 ");
         builder.append("select DATE_FORMAT( day, '%Y-%m-%d' ) as groupKey, ROUND(total/1024, 2) as count,  type from tb_report where is_delete=0 ");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");
@@ -117,17 +116,19 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String weekTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-//        builder.append(" select groupKey, sum(total) as count,type from (");
-//        builder.append(" select groupKey, total as count,type from (");
+        builder.append(" select groupKey, total as count,type from (");
         if ("add".equals(infoType)){
-            builder.append(" select groupKey, ROUND(sum(total)/1024, 2) as count,type from (");
+            // 容量累计相加
+            builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, ROUND(sum(total/1024),2) as total," +
+                    " type from tb_report where is_delete=0 ");
         } else {
-            builder.append(" select groupKey, ROUND(total/1024, 2) as count,type from (");
+            // 容量取平均值
+            builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, ROUND(AVG(total/1024),2) as total," +
+                    " type from tb_report where is_delete=0 ");
         }
 
 
-        builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, total," +
-                " type from tb_report where is_delete=0 ");
+
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");
         } else {
@@ -135,7 +136,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
         }
         builder.append(" and type='").append(type).append("'");
         builder.append(" and info_type='").append(infoType).append("'");
-        builder.append(" ) as a group by groupKey");
+
+        builder.append(" group by groupKey ) as a  ");
         builder.append(" order by groupKey desc");
 
         return builder.toString();
@@ -143,17 +145,14 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String monthTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-//        builder.append(" select groupKey, sum(total) as count,type from (");
-//        builder.append(" select groupKey, total as count,type from (");
-
+        builder.append(" select groupKey, total as count,type from (");
         if ("add".equals(infoType)){
-            builder.append(" select groupKey, ROUND(sum(total)/1024, 2) as count,type from (");
+            builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, ROUND(sum(total/1024),2) as total ,type from tb_report where is_delete=0");
         } else {
-            builder.append(" select groupKey, ROUND(total/1024, 2) as count,type from (");
+            builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, ROUND(avg(total/1024),2) as total ,type from tb_report where is_delete=0");
         }
 
-//        builder.append(" select groupKey, ROUND(total/1024, 2) as count,type from (");
-        builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, total,type from tb_report where is_delete=0");
+
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");
         } else {
@@ -162,7 +161,7 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
         }
         builder.append(" and type='").append(type).append("'");
         builder.append(" and info_type='").append(infoType).append("'");
-        builder.append(" ) as a group by groupKey");
+        builder.append(" group by groupKey ) as a ");
         builder.append(" order by groupKey desc");
 
         return builder.toString();
@@ -186,7 +185,6 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String weekWorkTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-//        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
         builder.append(" select groupKey, mix,age, pano,type from (");
         builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, " +
                 "mix, pano, age,type from tb_report where is_delete=0 ");
@@ -205,7 +203,6 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String monthWorkTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-//        builder.append(" select groupKey, sum(mix) as mix,sum(age) as age,sum(pano) as pano,type from (");
         builder.append(" select groupKey, mix,age, pano,type from (");
         builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, mix,age, pano,type from tb_report where is_delete=0");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {