能耗供取水数据接口, 增加orcale数据源配置

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

@@ -109,7 +109,7 @@ public class KprAimTapWaterBizFun {
                                 }
                                 recordAllEntity.put("value", value);
                                 List<Map<String, Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordAllList(1, 0,
-                                        " WHERE 1=1 "
+                                        " WHERE org_name = '" + recordAllEntity.get("org_name")
                                                 + "' AND time = '" + recordAllEntity.get("time") + "' AND value_tag = '" + recordAllEntity.get("value_tag") + "'");
                                 if (CollectionUtils.isEmpty(queryWaterRecord)) {
                                     //TODO 说明不存在,进行插入
@@ -189,7 +189,7 @@ public class KprAimTapWaterBizFun {
                                             for (int j = 0; j < tapWaterHistoryList.size(); j++) {
                                                 List<Map<String,Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordList(1,0,
                                                         " WHERE collcation_tag = '"+tapWaterHistoryList.get(j).get("TAG_CODE")
-                                                                +"' AND 1=1 "+"' AND time = '"+TimeTool.convertDateStr2UTC(tapWaterHistoryList.get(j).get("QCQUISITION_TIME").toString())+"'");
+                                                                +"' AND org_name = '"+tapWaterHistoryList.get(j).get("NAME")+"' AND time = '"+TimeTool.convertDateStr2UTC(tapWaterHistoryList.get(j).get("QCQUISITION_TIME").toString())+"'");
                                                 if(CollectionUtils.isEmpty(queryWaterRecord)){
                                                     //TODO 说明没插入过本系统,执行插入
                                                     String extend =  " ('"+tapWaterHistoryList.get(j).get("TAG_CODE")+"','"+tapWaterHistoryList.get(j).get("NAME")+"',"
@@ -278,7 +278,7 @@ public class KprAimTapWaterBizFun {
                                             for (int j = 0; j < tapWaterHistoryList.size(); j++) {
                                                 List<Map<String,Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordList(1,0,
                                                         " WHERE collcation_tag = '"+tapWaterHistoryList.get(j).get("TAG_CODE")
-                                                        +"' AND 1=1 "+"' AND time = '"+TimeTool.convertDateStr2UTC(tapWaterHistoryList.get(j).get("QCQUISITION_TIME").toString())+"'");
+                                                        +"' AND org_name = '"+tapWaterHistoryList.get(j).get("NAME")+"' AND time = '"+TimeTool.convertDateStr2UTC(tapWaterHistoryList.get(j).get("QCQUISITION_TIME").toString())+"'");
                                                 if(CollectionUtils.isEmpty(queryWaterRecord)){
                                                     //TODO 说明没插入过本系统,执行插入
                                                     String extend =  " ('"+tapWaterHistoryList.get(j).get("TAG_CODE")+"','"+tapWaterHistoryList.get(j).get("NAME")+"',"
@@ -407,23 +407,25 @@ public class KprAimTapWaterBizFun {
                                                     }
                                                     recordAllEntity.put("value", value);
                                                     List<Map<String, Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordAllList(1, 0,
-                                                            " WHERE 1=1 "
+                                                            " WHERE org_name = '" + recordAllEntity.get("org_name")
                                                                     + "' AND time = '" + recordAllEntity.get("time") + "' AND value_tag = '" + recordAllEntity.get("value_tag") + "'");
                                                     if (CollectionUtils.isEmpty(queryWaterRecord)) {
                                                         //TODO 说明不存在,进行插入
-                                                        int insertCode = getWaterTapWaterApi().insertWaterCollectionRecordAll(" (" +
-                                                                "'" + recordAllEntity.get("org_name") + "'," +
-                                                                "'" + recordAllEntity.get("time") + "'," +
-                                                                "'" + recordAllEntity.get("value") + "'," +
-                                                                "'" + recordAllEntity.get("value_tag") + "'," +
-                                                                "'" + recordAllEntity.get("collcation_tag_array") + "'" +
-                                                                ") ");
-                                                        if (insertCode < 0) {
-                                                            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR
-                                                                    , mStrClassName
-                                                                    , mStrClassName
-                                                                    , String.format("Batch initTapWaterDataThread 未成功:{%s} ",
-                                                                            FastJsonUtil.toJSON(recordAllEntity)));
+                                                        if(!ObjectUtils.isEmpty(recordAllEntity.get("value"))) {
+                                                            int insertCode = getWaterTapWaterApi().insertWaterCollectionRecordAll(" (" +
+                                                                    "'" + recordAllEntity.get("org_name") + "'," +
+                                                                    "'" + recordAllEntity.get("time") + "'," +
+                                                                    "'" + recordAllEntity.get("value") + "'," +
+                                                                    "'" + recordAllEntity.get("value_tag") + "'," +
+                                                                    "'" + recordAllEntity.get("collcation_tag_array") + "'" +
+                                                                    ") ");
+                                                            if (insertCode < 0) {
+                                                                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR
+                                                                        , mStrClassName
+                                                                        , mStrClassName
+                                                                        , String.format("Batch initTapWaterDataThread 未成功:{%s} ",
+                                                                                FastJsonUtil.toJSON(recordAllEntity)));
+                                                            }
                                                         }
                                                     }
                                                 }