自来水预测数据接口,bug修复, 时间戳转日期字符串

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

@@ -28,7 +28,9 @@ public class WaterCollecationDao {
     //TODO 查询样本及预测水量表;支持是否分页
     public List<Map<String,Object>> getTbMWater(boolean isPage,int limit,int offset,String extend){
         try{
-            String sql = "SELECT * FROM tb_m_water WHERE 1=1 ";
+            String sql = "SELECT " +
+                    " a.\"ID\",to_char(a.\"Date\", 'YYYY-MM-DD') AS \"Date\",a.\"Max_temperature\",a.\"Min_temperature\",a.\"Weather\",a.\"Month\",a.\"Week\",a.\"Holiday\",a.\"LastActualWaterWithdrawals\",a.\"LastActualWaterSupply\",a.\"ActualWaterWithdrawals\",a.\"ActualWaterSupply\",a.\"ForecastWaterWithdrawals\",a.\"ForecastActualWaterSupply\",a.\"isAbnormal\",a.\"isForecast\",a.\"LastModifyTime\",a.\"orgId\" " +
+                    " FROM tb_m_water AS a WHERE 1=1 ";
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;
             }
@@ -46,7 +48,9 @@ public class WaterCollecationDao {
     //TODO 查询小时水量预测表;支持是否分页
     public List<Map<String,Object>> getTbMHourwater(boolean isPage,int limit,int offset,String extend){
         try{
-            String sql = "SELECT * FROM tb_m_hourwater WHERE 1=1 ";
+            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\" " +
+                    " FROM tb_m_hourwater AS a WHERE 1=1 ";
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;
             }
@@ -64,7 +68,9 @@ public class WaterCollecationDao {
     //TODO 查询取水泵房电耗预测接口,支持是否分页
     public List<Map<String,Object>> getTbMHourwaterWaterwithdrawals(boolean isPage,int limit,int offset,String extend){
         try{
-            String sql = "SELECT * FROM tb_m_hourwater_waterwithdrawals WHERE 1=1 ";
+            String sql = "SELECT " +
+                    " to_char(a.\"Date\", 'YYYY-MM-DD') AS \"Date\",a.\"Hour\",a.\"PumpID\",a.\"PumpStatus\",a.\"HourForecastWaterWithdrawals\",a.\"PumpWater\",a.\"RealPumpStatus\",a.\"PumpEnergy\",a.\"RealPumpEnergy\",a.\"LastModifyTime\",a.\"ID\",a.\"orgId\" " +
+                    " FROM tb_m_hourwater_waterwithdrawals AS a WHERE 1=1 ";
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;
             }
@@ -82,7 +88,9 @@ public class WaterCollecationDao {
     //TODO 查询供水泵房电耗预测接口,支持是否分页
     public List<Map<String,Object>> getTbMHourwaterWatersupply(boolean isPage,int limit,int offset,String extend){
         try{
-            String sql = "SELECT * FROM tb_m_hourwater_watersupply WHERE 1=1 ";
+            String sql = "SELECT " +
+                    " a.\"ID\",to_char(a.\"Date\", 'YYYY-MM-DD') AS \"Date\",a.\"Hour\",a.\"PumpID\",a.\"PumpStatus\",a.\"HourForecastActualWaterSupply\",a.\"PumpWater\",a.\"RealPumpStatus\",a.\"PumpEnergy\",a.\"RealPumpEnergy\",a.\"LastModifyTime\",a.\"orgId\" " +
+                    " FROM tb_m_hourwater_watersupply AS a WHERE 1=1 ";
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;
             }