自来水预测数据接口 更改返回dao层结果

sql.properties

@@ -8,6 +8,10 @@ spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://119.96.165.176:5432/wat
 spring.datasource.db2.username=postgres
 spring.datasource.db2.password=kpr.23417.postgres
 spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
+#spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+#spring.datasource.db2.username=postgres
+#spring.datasource.db2.password=ygt.23417.postgres
+#spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
 
 
 spring.datasource.data2.jdbc-url=jdbc:postgresql://119.96.165.176:5432/water_smart_central?useSSL=false&useAffectedRows=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8

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

@@ -79,6 +79,9 @@ public class KprAimWaterCollecationBizFun {
             }
             return responseRes;
         }catch(Exception ex){
+            responseRes.setResdata(null);
+            responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+            responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
             return responseRes;
         }
     }
@@ -118,6 +121,9 @@ public class KprAimWaterCollecationBizFun {
             }
             return responseRes;
         }catch(Exception ex){
+            responseRes.setResdata(null);
+            responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+            responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
             return responseRes;
         }
     }
@@ -190,6 +196,9 @@ public class KprAimWaterCollecationBizFun {
             }
             return responseRes;
         }catch(Exception ex){
+            responseRes.setResdata(null);
+            responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+            responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
             return responseRes;
         }
     }
@@ -263,6 +272,9 @@ public class KprAimWaterCollecationBizFun {
             }
             return responseRes;
         }catch(Exception ex){
+            responseRes.setResdata(null);
+            responseRes.setResmsg(ResponseCode.RESULT_BAD.toStrMsg());
+            responseRes.setRescode(ResponseCode.RESULT_BAD.toStrCode());
             return responseRes;
         }
     }

src/main/java/com/shkpr/service/aimodelpower/controllerapi/WaterCollecationController.java

@@ -77,6 +77,10 @@ public class WaterCollecationController {
                 mStrClassName, strUserId,String.format("endDate:${%s}", TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT)));
         if(oRes!=null&&ResponseCode.RESULT_NORMAL.toStrCode().equals(oRes.getRescode())) {
             resResult.setResdata(FastJsonUtil.toJSON(oRes.getResdata()));
+        }else{
+            resResult.setRescode(ResponseCode.RESULT_BAD.toStrCode());
+            resResult.setResmsg(MSG_FAILED);
+            resResult.setResdata("");
         }
 
         resResult.setTimestamp(System.currentTimeMillis());
@@ -119,6 +123,10 @@ public class WaterCollecationController {
         ResponseRes oRes = KprAimWaterCollecationBizFun.selectTbHourWaterList(oJsonParam);
         if(oRes!=null&&ResponseCode.RESULT_NORMAL.toStrCode().equals(oRes.getRescode())) {
             resResult.setResdata(FastJsonUtil.toJSON(oRes.getResdata()));
+        }else{
+            resResult.setRescode(ResponseCode.RESULT_BAD.toStrCode());
+            resResult.setResmsg(MSG_FAILED);
+            resResult.setResdata("");
         }
 
         resResult.setTimestamp(System.currentTimeMillis());
@@ -176,6 +184,10 @@ public class WaterCollecationController {
         ResponseRes oRes = KprAimWaterCollecationBizFun.selectTbMHourwaterWaterwithdrawals(oJsonParam,inSubType);
         if(oRes!=null&&ResponseCode.RESULT_NORMAL.toStrCode().equals(oRes.getRescode())) {
             resResult.setResdata(FastJsonUtil.toJSON(oRes.getResdata()));
+        }else{
+            resResult.setRescode(ResponseCode.RESULT_BAD.toStrCode());
+            resResult.setResmsg(MSG_FAILED);
+            resResult.setResdata("");
         }
 
         resResult.setTimestamp(System.currentTimeMillis());
@@ -224,6 +236,10 @@ public class WaterCollecationController {
         ResponseRes oRes = KprAimWaterCollecationBizFun.selectTbMHourwaterWatersupply(oJsonParam,outSubType);
         if(oRes!=null&&ResponseCode.RESULT_NORMAL.toStrCode().equals(oRes.getRescode())) {
             resResult.setResdata(FastJsonUtil.toJSON(oRes.getResdata()));
+        }else{
+            resResult.setRescode(ResponseCode.RESULT_BAD.toStrCode());
+            resResult.setResmsg(MSG_FAILED);
+            resResult.setResdata("");
         }
 
         resResult.setTimestamp(System.currentTimeMillis());