From b09e1a8b036553d1e161d127aa738a504593490a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:14:55 +0800
Subject: [PATCH] 优化巡检路线查询sql
---
RuleService/src/main/java/com/java110/rule/common/RuleCommon.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java b/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
index 08708b5..c695e06 100644
--- a/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
+++ b/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
-import com.java110.common.constant.RuleDomain;
-import com.java110.common.log.LoggerEngine;
-import com.java110.common.util.RuleUtil;
-import com.java110.common.util.SpringBeanInvoker;
+import com.java110.utils.constant.RuleDomain;
+import com.java110.utils.log.LoggerEngine;
+import com.java110.utils.util.RuleUtil;
+import com.java110.utils.util.SpringBeanInvoker;
import com.java110.entity.rule.ContractRootRule;
import com.java110.entity.rule.Rule;
import com.java110.entity.rule.RuleCondCfg;
@@ -49,7 +49,7 @@
java.sql.Timestamp startTime = new java.sql.Timestamp(Calendar.getInstance().getTime().getTime());
String condReturnXml = "";
- Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+ Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
Rule rule = ruleMap.get(ruleId);
Map<String,String> map = new HashMap<String,String>();
@@ -96,7 +96,7 @@
Map<String,String> returnMap = new HashMap<String,String>();
dataStackMap = new HashMap<String,String>();
- Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+ Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
List<RuleCondCfg> ruleCondCfgList = ruleMap.get(ruleId).getRuleCondCfgs();
ruleNodeMap = new HashMap<String,String>();
ruleDbMap = new HashMap<String, List<Map<String,String>>>();
@@ -432,7 +432,7 @@
java.sql.Timestamp startTime = new java.sql.Timestamp(Calendar.getInstance().getTime().getTime());
String condReturnXml = "";
- Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+ Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
Rule rule = ruleMap.get(ruleId);
if(!StringUtils.isEmpty(rule.getRule_url())){
@@ -496,6 +496,15 @@
return errorMsg;
}
+ /**
+ * 涓轰簡澶氱嚎绋嬫椂鍙互鐢ㄥ埌杩欓噷鎴戜滑涓浆涓�涓�
+ * @return
+ * @throws Exception
+ */
+ public Map<String,Rule> getRuleMap() throws Exception{
+ return ruleDaoImpl.getRuleMap();
+ }
+
public void saveRuleCommonCondLog(String transactionID,String ruleID,String ruleNodeValue,Map<String,String> returnMap) throws Exception {
/* String retCode = returnMap.get("retCode");
String retMsg = returnMap.get("retMsg");
--
Gitblit v1.8.0