From ecdac8a738f254db2b2ea28cbe3248f7a6a7eb2b Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 16:18:27 +0800
Subject: [PATCH] 优化采购申请组件
---
RuleService/src/main/java/com/java110/rule/thread/RuleCommonThread.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/RuleService/src/main/java/com/java110/rule/thread/RuleCommonThread.java b/RuleService/src/main/java/com/java110/rule/thread/RuleCommonThread.java
index 4efed7f..88b3c87 100644
--- a/RuleService/src/main/java/com/java110/rule/thread/RuleCommonThread.java
+++ b/RuleService/src/main/java/com/java110/rule/thread/RuleCommonThread.java
@@ -1,13 +1,14 @@
package com.java110.rule.thread;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.RuleDomain;
-import com.java110.common.log.LoggerEngine;
-import com.java110.common.util.CodeMapUtil;
-import com.java110.common.util.RuleUtil;
+import com.java110.utils.constant.RuleDomain;
+import com.java110.utils.log.LoggerEngine;
+import com.java110.utils.util.CodeMapUtil;
import com.java110.entity.rule.ContractRootRule;
import com.java110.entity.rule.Rule;
import com.java110.rule.common.RuleCommon;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import java.util.List;
@@ -19,6 +20,7 @@
*/
public class RuleCommonThread extends LoggerEngine{
+ private final static Logger logger = LoggerFactory.getLogger(RuleCommonThread.class);
private RuleCommon ruleCommon;
@@ -51,7 +53,7 @@
ruleCompletionService.submit(new Callable<String>(){
public String call() throws Exception{
try {
- Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+ Map<String,Rule> ruleMap = ruleCommon.getRuleMap();
Rule rule = ruleMap.get(ruleIdStr);
String url = rule.getRule_url();
String condRtn = "";
@@ -120,7 +122,7 @@
public void run() {
Rule rule = null;
try{
- Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+ Map<String,Rule> ruleMap = ruleCommon.getRuleMap();
rule = ruleMap.get(ruleId);
String url = rule.getRule_url();
String condRtn = "";
--
Gitblit v1.8.0