修复sql问题

src/main/java/com/shkpr/service/aimodelpower/dbdao/services/WaterVolumePredictServiceImpl.java

@@ -124,9 +124,25 @@ public class WaterVolumePredictServiceImpl implements WaterVolumePredictService
      */
     @Override
     public Boolean migrateData(String orgName) {
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO, mBizType, mStrClassName
+                , String.format("开始执行迁移预测数据 组织名称:%s", orgName));
+        long begin = System.currentTimeMillis();
+
+        //执行迁移
         int dayMigrated = waterVolumePredictMapper.migrateDay(orgName);
         int hourMigrated = waterVolumePredictMapper.migrateHour(orgName);
-        return dayMigrated + hourMigrated > 0;
+        int migrated = dayMigrated + hourMigrated;
+
+        long end = System.currentTimeMillis();
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO, mBizType, mStrClassName
+                , String.format(
+                        "结束执行迁移预测数据,组织名称:%s,迁移数量:%d,用时(毫秒):%d",
+                        orgName,
+                        migrated
+                        , (end - begin)
+                )
+        );
+        return migrated > 0;
     }
 
     /**

src/main/resources/mapper/WaterVolumePredictMapper.xml

@@ -82,14 +82,14 @@
                0                                                      as "isAbnormal",
                0                                                      as "isForecast",
                now()                                                  as "LastModifyTime",
-               d.org_id                                               as "orgId"
-        from (select to_char(to_date(wcr.time, 'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd') as day,
-                     sum(wcr.value::numeric)                                           as value,
-                     woc.org_id                                                        as org_id
-              from water_collecation_record wcr
-                       left join water_org_config woc on wcr.org_name = woc.org_name
+               o.org_id                                               as "orgId"
+        from (select org_name,
+                     to_char(to_date(wcr.time, 'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd') as day,
+                     sum(wcr.value::numeric)                                           as value
+              from water_collecation_record_all wcr
               where wcr.org_name = #{orgName,jdbcType=VARCHAR}
               group by wcr.org_name, to_char(to_date(wcr.time, 'yyyy-mm-dd hh24:mi:ss'), 'yyyy-mm-dd')) d
+                 left join water_org_config o on d.org_name = o.org_name
         ORDER BY "Date";
     </insert>