From 00a9bbf99abf3ecc343e501730826f5209de47e2 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期一, 24 七月 2017 00:50:07 +0800
Subject: [PATCH] 加入redis 和 ehcache 缓存系统,规则引擎服务彻底完工

---
 RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java b/RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java
index 529b8c3..85fd39c 100644
--- a/RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java
+++ b/RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java
@@ -11,6 +11,7 @@
 import com.java110.entity.rule.RuleEntrance;
 import com.java110.entity.rule.TcpContRule;
 import com.java110.rule.common.RuleCommon;
+import com.java110.rule.dao.IRuleDao;
 import com.java110.rule.smo.IRuleServiceSMO;
 import com.java110.rule.thread.RuleCommonThread;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,9 @@
 
     @Autowired
     RuleCommon ruleCommon;
+
+    @Autowired
+    IRuleDao ruleDaoImpl;
 
 
 
@@ -127,12 +131,12 @@
         String roamFlag = RuleDomain.RULE_COND_RETURN_0000;
             String depPrvncSaopRuleType = CodeMapUtil.getDynamicConstantValue("DEP_PRVNC_RULE_TYPE");
             //鑾峰彇琛� Rule_Entrance 鏁版嵁
-            Map<String,RuleEntrance> ruleEntranceMap = RuleUtil.getRuleEntranceMap();
+            Map<String,RuleEntrance> ruleEntranceMap = ruleDaoImpl.getRuleEntranceMap();
             int ruleCount = 0;
             this.ruleCommon.init();
 
             //褰撳墠鍒嗙粍涓嬬殑瑙勫垯缂栫爜闆嗗悎
-            List ruleIdsInCurGroupList = RuleUtil.getRuleIdsInGroupByJson(reqJson.toJSONString());
+            List ruleIdsInCurGroupList = RuleUtil.getRuleIdsInGroupByJson(reqJson.toJSONString(),ruleDaoImpl.getRuleGroupRelaList());
 
             //鑰楁椂鏄庣粏淇℃伅闆嗗悎
             List costTimeMapList = new ArrayList();
@@ -182,7 +186,7 @@
                     ruleCount ++;
                     ruleList.add(ruleEntrance.getRule_id());
                 }else{//閰嶇疆1涓哄崟绾跨▼涓茶璋冪敤妯″紡
-                    Rule rule = RuleUtil.getRuleMap().get(ruleEntrance.getRule_id());
+                    Rule rule = ruleDaoImpl.getRuleMap().get(ruleEntrance.getRule_id());
                     String url = rule.getRule_url();
                     String entranceRetrunXml = "";
                     if(!StringUtils.isEmpty(url)){
@@ -252,4 +256,12 @@
     public void setRuleCommon(RuleCommon ruleCommon) {
         this.ruleCommon = ruleCommon;
     }
+
+    public IRuleDao getRuleDaoImpl() {
+        return ruleDaoImpl;
+    }
+
+    public void setRuleDaoImpl(IRuleDao ruleDaoImpl) {
+        this.ruleDaoImpl = ruleDaoImpl;
+    }
 }

--
Gitblit v1.8.0