远通数据源接入机制: 完成水量预测日数据接口和时数据接口查询

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

@@ -63,8 +63,8 @@ public class KprAimWaterCollecationBizFun {
         map.put("LastModifyTime",null);
         list.add(map);
         responseRes.setResdata(list);
-        responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
-        responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+        responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
+        responseRes.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
         try {
             //
             List<Map<String, Object>> resList = getWaterTapWaterApi().getTbMWater(jpTbMWater.getIsPage(),
@@ -100,8 +100,8 @@ public class KprAimWaterCollecationBizFun {
         map.put("LastModifyTime",null);
         list.add(map);
         responseRes.setResdata(list);
-        responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
-        responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+        responseRes.setRescode(ResponseCode.RESULT_NORMAL.toStrCode());
+        responseRes.setResmsg(ResponseCode.RESULT_NORMAL.toStrMsg());
         try {
             //
             List<Map<String, Object>> resList = getWaterTapWaterApi().getTbMHourwater(jpTbMHourWater.getIsPage(),

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

@@ -72,7 +72,7 @@ public class JPTbMWater {
                     //TODO 说明符合可组成查询日期的条件
                     //TODO 按照需求,特殊化结束时间再加4天
                     startLocalDate = startLocalDate.with(TemporalAdjusters.firstDayOfMonth());
-                    endLocalDate = endLocalDate.minusDays(-4).with(TemporalAdjusters.lastDayOfMonth());
+                    endLocalDate = endLocalDate.minusDays(-4);
                     String startLocalDateStr = startLocalDate.format(formatter);
                     String endLocalDateStr = endLocalDate.format(formatter);
                     strSql.append(" AND \"Date\" BETWEEN  '"+startLocalDateStr+"' "+"AND '"+endLocalDateStr+"'");