江津预测模块升级,更改部分逻辑代码

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

@@ -366,27 +366,6 @@ public class KprAimWaterCollecationBizFun {
     ,Map<String,String> workZonIds){
         ResponseRes responseRes = new ResponseRes();
         List<Map<String,Object>> list =new ArrayList<>();
-        if("water_volume_prediction_jiangjin2".equals(databaseName)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", null);
-            map.put("date", null);
-            map.put("max_temperature", null);
-            map.put("min_temperature", null);
-            map.put("weather", null);
-            map.put("month", null);
-            map.put("week", null);
-            map.put("holiday", null);
-            map.put("last_actual_water_withdrawals", null);
-            map.put("last_actual_water_supply", null);
-            map.put("actual_water_withdrawals", null);
-            map.put("actual_water_supply", null);
-            map.put("forecast_water_withdrawals", null);
-            map.put("forecast_actual_water_supply", null);
-            map.put("is_abnormal", null);
-            map.put("is_forecast", null);
-            map.put("last_modify_time", null);
-            list.add(map);
-        }else {
             Map<String, Object> map = new HashMap<>();
             map.put("ID", null);
             map.put("Date", null);
@@ -406,7 +385,6 @@ public class KprAimWaterCollecationBizFun {
             map.put("isForecast", null);
             map.put("LastModifyTime", null);
             list.add(map);
-        }
         responseRes.setResdata(list);
         responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
         responseRes.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
@@ -538,22 +516,6 @@ public class KprAimWaterCollecationBizFun {
                 , "2222");
         ResponseRes responseRes = new ResponseRes();
         List<Map<String, Object>> list = new ArrayList<>();
-        if("water_volume_prediction_jiangjin2".equals(databaseName)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", null);
-            map.put("date", null);
-            map.put("hour", null);
-            map.put("hour_forecast_water_withdrawals", null);
-            map.put("hour_forecast_actual_water_supply", null);
-            map.put("water_withdrawals_energy", null);
-            map.put("water_supply_energy", null);
-            map.put("real_water_withdrawals_energy", null);
-            map.put("real_water_supply_energy", null);
-            map.put("last_modify_time", null);
-            map.put("hour_actual_water_withdrawals", null);
-            map.put("hour_actual_water_supply ", null);
-            list.add(map);
-        }else {
             Map<String, Object> map = new HashMap<>();
             map.put("ID", null);
             map.put("Date", null);
@@ -568,7 +530,6 @@ public class KprAimWaterCollecationBizFun {
             map.put("HourActualWaterWithdrawals", null);
             map.put("HourActualWaterSupply ", null);
             list.add(map);
-        }
         responseRes.setResdata(list);
         responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
         responseRes.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
@@ -718,22 +679,6 @@ public class KprAimWaterCollecationBizFun {
         entity.setPumpId(null);
         entity.setSubType(subType);
         List<Map<String, Object>> defaultRes = new ArrayList<>();
-        if("water_volume_prediction_jiangjin2".equals(databaseName)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", null);
-            map.put("date", null);
-            map.put("hour", null);
-            map.put("pump_id", null);
-            map.put("pump_status", null);
-            map.put("hour_forecast_water_withdrawals", null);
-            map.put("pump_water", null);
-            map.put("real_pump_status", null);
-            map.put("pump_energy", null);
-            map.put("real_pump_energy", null);
-            map.put("last_modify_time", null);
-            map.put("zone_id", null);
-            defaultRes.add(map);
-        }else {
             Map<String, Object> map = new HashMap<>();
             map.put("ID", null);
             map.put("Date", null);
@@ -748,7 +693,6 @@ public class KprAimWaterCollecationBizFun {
             map.put("LastModifyTime", null);
             map.put("orgId", null);
             defaultRes.add(map);
-        }
         defaultModels.add(entity);
         responseRes.setResdata(defaultModels);
         responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
@@ -810,22 +754,6 @@ public class KprAimWaterCollecationBizFun {
         entity.setPumpId(null);
         entity.setSubType(subType);
         List<Map<String, Object>> defaultRes = new ArrayList<>();
-        if("water_volume_prediction_jiangjin2".equals(databaseName)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", null);
-            map.put("date", null);
-            map.put("hour", null);
-            map.put("pump_id", null);
-            map.put("pump_status", null);
-            map.put("hour_forecast_actual_water_supply", null);
-            map.put("pump_water", null);
-            map.put("real_pump_status", null);
-            map.put("pump_energy", null);
-            map.put("real_pump_energy", null);
-            map.put("last_modify_time", null);
-            map.put("zone_id", null);
-            defaultRes.add(map);
-        }else {
             Map<String, Object> map = new HashMap<>();
             map.put("ID", null);
             map.put("Date", null);
@@ -840,7 +768,6 @@ public class KprAimWaterCollecationBizFun {
             map.put("LastModifyTime", null);
             map.put("orgId", null);
             defaultRes.add(map);
-        }
         defaultModels.add(entity);
         responseRes.setResdata(defaultModels);
         responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
@@ -852,7 +779,7 @@ public class KprAimWaterCollecationBizFun {
             if("water_volume_prediction_jiangjin2".equals(databaseName)){
                 //TODO 按水厂分组
                 Map<Object, List<Map<String, Object>>> groupedData =
-                        resList.stream().collect(Collectors.groupingBy(item -> item.get("zone_id")));
+                        resList.stream().collect(Collectors.groupingBy(item -> item.get("orgId")));
                 //TODO 查询水厂的取水泵,然后将数据拼接
                 List<InPumpModel> inPumpModels = new ArrayList<>();
                 for (Object key : groupedData.keySet()) {
@@ -867,12 +794,12 @@ public class KprAimWaterCollecationBizFun {
                     //TODO 将年月日时作为分组条件
                     Map<String, List<Map<String, Object>>> dataMap = dataList.stream()
                             .collect(Collectors.groupingBy(emp ->
-                                    emp.get("date") + " " + emp.get("hour") // 创建复合键
+                                    emp.get("Date") + " " + emp.get("Hour") // 创建复合键
                             ));
                     model.setDataList(dataMap);
                     //TODO 查询相应方案数据
                     List<Map<String, Object>> drawalsList = getWaterTapWaterApi().getTbMWatersupplypump(false,
-                            20, 0, " AND \"zone_id\" = '" + key.toString() + "'");
+                            20, 0, " AND \"orgId\" = '" + key.toString() + "'");
                     model.setDrawalsList(drawalsList);
                     inPumpModels.add(model);
                 }

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

@@ -33,15 +33,10 @@ public class WaterCollecationDao {
     //TODO 查询样本及预测水量表;支持是否分页
     public List<Map<String,Object>> getTbMWater(boolean isPage,int limit,int offset,String extend){
             String sql = "";
-            if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
-                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.\"last_actual_water_withdrawals\",a.\"last_actual_water_supply\",a.\"actual_water_withdrawals\",a.\"actual_water_supply\",a.\"forecast_water_withdrawals\",a.\"forecast_actual_water_supply\",a.\"is_abnormal\",a.\"is_forecast\",a.\"last_modify_time\",a.\"zone_id\" " +
-                        " FROM tb_m_water AS a WHERE 1=1 ";
-            }else {
+
                 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;
             }
@@ -57,17 +52,10 @@ public class WaterCollecationDao {
     //TODO 查询小时水量预测表;支持是否分页
     public List<Map<String,Object>> getTbMHourwater(boolean isPage,int limit,int offset,String extend){
             String sql = "";
-            if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
-                sql = "SELECT " +
-                        " a.\"id\",to_char(a.\"date\", 'YYYY-MM-DD') AS \"date\",a.\"hour\",a.\"hour_forecast_water_withdrawals\",a.\"hour_forecast_actual_water_supply\",a.\"water_withdrawals_energy\",a.\"water_supply_energy\",a.\"real_water_withdrawals_energy\",a.\"real_water_supply_energy\",a.\"last_modify_time\",a.\"zone_id\"," +
-                        " a.\"hour_actual_water_withdrawals\",a.\"hour_actual_water_supply\" " +
-                        " FROM tb_m_hourwater AS a WHERE 1=1 ";
-            }else {
                 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.\"HourActualWaterWithdrawals\",a.\"HourActualWaterSupply\" " +
                         " FROM tb_m_hourwater AS a WHERE 1=1 ";
-            }
             if(!StringUtils.isEmpty(extend)){
                 sql+=extend;
             }
@@ -83,15 +71,9 @@ public class WaterCollecationDao {
     //TODO 查询取水泵房电耗预测接口,支持是否分页
     public List<Map<String,Object>> getTbMHourwaterWaterwithdrawals(boolean isPage,int limit,int offset,String extend){
             String sql = "";
-            if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
-                sql = "SELECT " +
-                        " to_char(a.\"date\", 'YYYY-MM-DD') AS \"date\",a.\"hour\",a.\"pump_id\",a.\"pump_status\",a.\"hour_forecast_water_withdrawals\",a.\"pump_water\",a.\"real_pump_status\",a.\"pump_energy\",a.\"real_pump_energy\",a.\"last_modify_time\",a.\"id\",a.\"zone_id\" " +
-                        " FROM tb_m_hourwater_waterwithdrawals AS a WHERE 1=1 ";
-            }else {
                 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;
             }
@@ -107,15 +89,11 @@ public class WaterCollecationDao {
     //TODO 查询供水泵房电耗预测接口,支持是否分页
     public List<Map<String,Object>> getTbMHourwaterWatersupply(boolean isPage,int limit,int offset,String extend){
             String sql = "";
-            if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
-                sql = "SELECT " +
-                        " a.\"id\",to_char(a.\"date\", 'YYYY-MM-DD') AS \"date\",a.\"hour\",a.\"pump_id\",a.\"pump_status\",a.\"hour_forecast_actual_water_supply\",a.\"pump_water\",a.\"real_pump_status\",a.\"pump_energy\",a.\"real_pump_energy\",a.\"last_modify_time\",a.\"zone_id\" " +
-                        " FROM tb_m_hourwater_watersupply AS a WHERE 1=1 ";
-            }else {
+
                 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;
             }

src/main/java/com/shkpr/service/aimodelpower/jsonbean/zilaishui/JPTbMHourWater.java

@@ -41,38 +41,6 @@ public class JPTbMHourWater {
     private String forDateStr;
 
     public boolean checkValid(){
-        if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            StringBuilder strSql = new StringBuilder("");
-            if (!StringUtils.isEmpty(orgId)) {
-                strSql.append(" AND \"zone_id\" = '" + orgId + "'");
-            }
-            if (queryDate == null) {
-                //TODO 说明前端没传,那么默认为今天
-                LocalDateTime nowDate = LocalDateTime.now();//结束时间
-                nowDate = nowDate.with(TemporalAdjusters.lastDayOfMonth());
-                nowDate = nowDate.withHour(0);
-                nowDate = nowDate.withMinute(0);
-                nowDate = nowDate.withSecond(0);
-
-                strSql.append(" AND \"date\" =  '" + nowDate.format(formatter) + "' ");
-                forDateStr = strSql.toString();
-            } else if (queryDate != null) {
-                try {
-                    //TODO 说明符合可组成查询日期的条件
-                    String sqlStr = LocalDateTime.ofInstant(Instant.ofEpochMilli(queryDate), ZoneId.systemDefault())
-                            .withHour(0).withMinute(0).withSecond(0).format(formatter);
-                    strSql.append(" AND \"date\" =  '" + sqlStr + "' ");
-                    forDateStr = strSql.toString();
-                } catch (Exception ex) {
-                    LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR, "JPCustomerMeterSS", "JPCustomerMeterSS"
-                            , String.format("errorMsg:%s====>"
-                                    , ex.getLocalizedMessage()));
-                    return false;
-                }
-            }
-            return true;
-        }else {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             StringBuilder strSql = new StringBuilder("");
             if (!StringUtils.isEmpty(orgId)) {
@@ -103,6 +71,5 @@ public class JPTbMHourWater {
                 }
             }
             return true;
-        }
     }
 }

src/main/java/com/shkpr/service/aimodelpower/jsonbean/zilaishui/JPTbMWater.java

@@ -41,72 +41,6 @@ public class JPTbMWater {
     private String forDateStr;
 
     public boolean checkValid(){
-        if ("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            if (startDate == null && endDate != null) {
-                return false;
-            }
-            StringBuilder strSql = new StringBuilder("");
-            if (!StringUtils.isEmpty(orgId)) {
-                strSql.append(" AND \"zone_id\" = '" + orgId + "'");
-            }
-            if (startDate == null && endDate == null) {
-                //TODO 说明前端没传,那么默认为当前月往前推到一号作为开始和结束条件
-                LocalDateTime nowDate = LocalDateTime.now();//结束时间
-                nowDate = nowDate.with(TemporalAdjusters.lastDayOfMonth());
-                nowDate = nowDate.withHour(0);
-                nowDate = nowDate.withMinute(0);
-                nowDate = nowDate.withSecond(0);
-
-                LocalDateTime startLocalDate = nowDate;
-                startLocalDate = startLocalDate.with(TemporalAdjusters.firstDayOfMonth());
-
-                String startLocalDateStr = startLocalDate.format(formatter);
-                String endLocalDateStr = nowDate.format(formatter);
-                strSql.append(" AND \"date\" BETWEEN  '" + startLocalDateStr + "' " + "AND '" + endLocalDateStr + "'");
-                forDateStr = strSql.toString();
-                startDate = TimeTool.convertDateStr2UTC(startLocalDateStr);
-                endDate = TimeTool.convertDateStr2UTC(endLocalDateStr);
-            } else if (startDate != null && endDate != null) {
-                try {
-                    LocalDateTime startLocalDate = LocalDateTime.parse(TimeTool.convertUTC2DateStr(startDate, TimeTool.TIMESTAMP_FORMAT), DateTimeFormatter.ofPattern(TimeTool.TIMESTAMP_FORMAT));
-                    LocalDateTime endLocalDate = LocalDateTime.parse(TimeTool.convertUTC2DateStr(endDate, TimeTool.TIMESTAMP_FORMAT), DateTimeFormatter.ofPattern(TimeTool.TIMESTAMP_FORMAT));
-//                long monthsBetween = ChronoUnit.MONTHS.between(startLocalDate, endLocalDate);
-                    if (startLocalDate.isAfter(endLocalDate)) {
-                        return false;
-                    } else if (endLocalDate.isBefore(startLocalDate)) {
-                        return false;
-                    } else if (startLocalDate.equals(endLocalDate) || startLocalDate.isBefore(endLocalDate)) {
-                        //TODO 说明符合可组成查询日期的条件
-                        //TODO 按照需求,特殊化结束时间再加4天
-                        startLocalDate = startLocalDate.with(TemporalAdjusters.firstDayOfMonth());
-                        endLocalDate = endLocalDate.minusDays(-4);
-                        String startLocalDateStr = startLocalDate.format(formatter);
-                        String endLocalDateStr = endLocalDate.format(formatter);
-                        strSql.append(" AND \"date\" BETWEEN  '" + startLocalDateStr + "' " + "AND '" + endLocalDateStr + "'");
-                        forDateStr = strSql.toString();
-                        startDate = TimeTool.convertDateStr2UTC(startLocalDateStr);
-                        endDate = TimeTool.convertDateStr2UTC(endLocalDateStr);
-                    }
-                } catch (Exception ex) {
-                    LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR, "JPCustomerMeterSS", "JPCustomerMeterSS"
-                            , String.format("errorMsg:%s====>"
-                                    , ex.getLocalizedMessage()));
-                    return false;
-                }
-            } else if (startDate != null && endDate == null) {//警告没事,增加代码可读性
-                //TODO 说明startDate传了  endDate没传 , 那么endDate为startDate月的最后一天
-                LocalDateTime startLocalDate = LocalDateTime.parse(TimeTool.convertUTC2DateStr(startDate, TimeTool.TIMESTAMP_FORMAT), DateTimeFormatter.ofPattern(TimeTool.TIMESTAMP_FORMAT))
-                        .with(TemporalAdjusters.firstDayOfMonth());
-                LocalDateTime endLocalDate = startLocalDate.with(TemporalAdjusters.lastDayOfMonth());
-                String startLocalDateStr = startLocalDate.format(formatter);
-                String endLocalDateStr = endLocalDate.format(formatter);
-                strSql.append(" AND \"date\" BETWEEN  '" + startLocalDateStr + "' " + "AND '" + endLocalDateStr + "'");
-                forDateStr = strSql.toString();
-                endDate = TimeTool.convertDateStr2UTC(endLocalDateStr);
-            }
-            return true;
-        }else {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             if (startDate == null && endDate != null) {
                 return false;
@@ -171,6 +105,5 @@ public class JPTbMWater {
                 endDate = TimeTool.convertDateStr2UTC(endLocalDateStr);
             }
             return true;
-        }
     }
 }