自来水预测数据接口

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimWaterCollecationBizFun.java

@@ -101,6 +101,8 @@ public class KprAimWaterCollecationBizFun {
         map.put("RealWaterWithdrawalsEnergy",null);
         map.put("RealWaterSupplyEnergy",null);
         map.put("LastModifyTime",null);
+        map.put("HourActualWaterWithdrawals",null);
+        map.put("HourActualWaterSupply ",null);
         list.add(map);
         responseRes.setResdata(list);
         responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());

src/main/java/com/shkpr/service/aimodelpower/dbdao/shizilaishuiDataSource/WaterCollecationDao.java

@@ -49,7 +49,8 @@ public class WaterCollecationDao {
     public List<Map<String,Object>> getTbMHourwater(boolean isPage,int limit,int offset,String extend){
         try{
             String sql = "SELECT " +
-                    " a.\"ID\",to_char(a.\"Date\", 'YYYY-MM-DD') AS \"Date\",a.\"Hour\",a.\"HourForecastWaterWithdrawals\",a.\"HourForecastActualWaterSupply\",a.\"WaterWithdrawalsEnergy\",a.\"WaterSupplyEnergy\",a.\"RealWaterWithdrawalsEnergy\",a.\"RealWaterSupplyEnergy\",a.\"LastModifyTime\",a.\"orgId\" " +
+                    " a.\"ID\",to_char(a.\"Date\", 'YYYY-MM-DD') AS \"Date\",a.\"Hour\",a.\"HourForecastWaterWithdrawals\",a.\"HourForecastActualWaterSupply\",a.\"WaterWithdrawalsEnergy\",a.\"WaterSupplyEnergy\",a.\"RealWaterWithdrawalsEnergy\",a.\"RealWaterSupplyEnergy\",a.\"LastModifyTime\",a.\"orgId\"," +
+                    " a.HourActualWaterWithdrawals,a.HourActualWaterSupply  " +
                     " FROM tb_m_hourwater AS a WHERE 1=1 ";
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;