From d4e1929dcab147030d3bcae89b1801250fd6a5da Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 25 四月 2019 11:25:43 +0800
Subject: [PATCH] 优化feign 异常处理

---
 RuleService/src/main/java/com/java110/rule/smo/impl/RuleServiceSMOImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 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..19867d0 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,8 +11,11 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -27,6 +30,7 @@
  */
 @Service("ruleServiceSMOImpl")
 public class RuleServiceSMOImpl extends BaseServiceSMO implements IRuleServiceSMO {
+    private final static Logger logger = LoggerFactory.getLogger(RuleServiceSMOImpl.class);
 
 
     public static DateFormat df = new SimpleDateFormat("yyyyMMddHHmmSSS");
@@ -35,6 +39,9 @@
 
     @Autowired
     RuleCommon ruleCommon;
+
+    @Autowired
+    IRuleDao ruleDaoImpl;
 
 
 
@@ -127,12 +134,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 +189,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 +259,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