台州xml数据页面模板id映射修改

kernel/src/main/java/com/lantone/qc/kernel/analysis/QCAnalysis.java

@@ -5,8 +5,6 @@ import com.lantone.qc.kernel.client.CRFServiceClient;
 import com.lantone.qc.kernel.client.SimilarityServiceClient;
 import com.lantone.qc.kernel.structure.ai.AIAnalyze;
 import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.kernel.util.ModuleMappingUtil;
-import com.lantone.qc.kernel.util.RedisUtil;
 import com.lantone.qc.pub.exception.AIException;
 import com.lantone.qc.pub.exception.CatalogueException;
 import com.lantone.qc.pub.model.InputInfo;
@@ -16,7 +14,6 @@ import com.lantone.qc.trans.TransDispatch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -33,20 +30,14 @@ public class QCAnalysis {
     @Autowired
     SimilarityServiceClient similarityServiceClient;
 
-    @Autowired
-    private RedisUtil redisUtil;
-
-    @Autowired
-    private ModuleMappingUtil moduleMappingUtil;
-
     public OutputInfo anlysis(QueryVo queryVo) throws AIException, CatalogueException, Exception {
         OutputInfo outputInfo = new OutputInfo();
         InputInfo inputInfo = TransDispatch.trans(queryVo);
         inputInfo.setInputCatalogueMap(queryVo.getInputCatalogueMap());
         AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient, similarityServiceClient);
-        try{
+        try {
             aiAnalyze.aiProcess(inputInfo);
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new AIException("AI模型执行错误：" + e.getMessage());
         }
         for (Map.Entry<String, Map<String, String>> entry : inputInfo.getInputCatalogueMap().entrySet()) {
@@ -55,13 +46,12 @@ public class QCAnalysis {
             }
             CatalogueUtil.qcCatalogueMap.get(entry.getKey()).execute(inputInfo, outputInfo);
         }
-        moduleMappingUtil.moduleIdInsert(inputInfo.getPageData());
         outputInfo.setPageData(inputInfo.getPageData());
         Map<String, Map<String, String>> result = outputInfo.getResult();
         Map<String, Map<String, String>> resultNew = Maps.newHashMap();
-        result.keySet().forEach(key->{
+        result.keySet().forEach(key -> {
             if (result.get(key).get("status").equals("-1")) {
-                resultNew.put(key,result.get(key));
+                resultNew.put(key, result.get(key));
             }
         });
         outputInfo.setResult(resultNew);

kernel/src/main/java/com/lantone/qc/kernel/util/CacheUtil.java

@@ -8,6 +8,7 @@ import com.lantone.qc.nlp.participle.cfg.Configuration;
 import com.lantone.qc.nlp.participle.cfg.DefaultConfig;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.FileUtil;
+import com.lantone.qc.trans.comsis.ModuleMappingUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +20,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ResourceUtils;
 
 import java.io.FileNotFoundException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @ClassName : CacheUtil
@@ -32,8 +39,6 @@ public class CacheUtil implements ApplicationRunner {
     Logger logger = LoggerFactory.getLogger(DefaultConfig.class);
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private ModuleMappingUtil moduleMappingUtil;
 
     @Value("${qc.hospital_id}")
     private String hospitalId;
@@ -77,7 +82,7 @@ public class CacheUtil implements ApplicationRunner {
 //                mapKeysModuleInfoIdMap.keySet().forEach(mapKeys -> {
 //                    xmlDataTypeModuleInfo.put(Sets.newLinkedHashSet(Arrays.asList(mapKeys.split(","))), mapKeysModuleInfoIdMap.get(mapKeys) + "");
 //                });
-                moduleMappingUtil.setXmlDataTypeModuleInfo(xmlDataTypeModuleInfo);
+                ModuleMappingUtil.xmlDataTypeModuleInfo = xmlDataTypeModuleInfo;
             }
         } catch (FileNotFoundException e) {
             e.printStackTrace();

kernel/src/main/java/com/lantone/qc/kernel/util/ModuleMappingUtil.java

@@ -1,77 +0,0 @@
-package com.lantone.qc.kernel.util;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.lantone.qc.pub.util.StringUtil;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-/**
- * @Description: 页面模板映射工具类
- * @author: rengb
- * @time: 2020/4/30 10:03
- */
-@Component
-@Getter
-@Setter
-public class ModuleMappingUtil {
-    @Value("${qc.hospital_id}")
-    private String hospitalId;
-    private List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "3");
-    private Map<Set<String>, String> xmlDataTypeModuleInfo = Maps.newLinkedHashMap();
-
-    public void moduleIdInsert(Map<String, Object> pageData) {
-        if (xmlDataTypeHospitalIds.contains(hospitalId)) {
-            xmlDataTypeModuleIdInsert(pageData);
-        }
-    }
-
-    private void xmlDataTypeModuleIdInsert(Map<String, Object> pageData) {
-        if (MapUtils.isEmpty(pageData)) {
-            return;
-        }
-        List<Map<String, String>> sourceMaps = Lists.newArrayList();
-        pageData.keySet().forEach(pageDataKey -> {
-            Object object = pageData.get(pageDataKey);
-            if (object instanceof List) {
-                sourceMaps.addAll((List) object);
-            } else if (object instanceof Map) {
-                sourceMaps.add((Map) object);
-            }
-        });
-
-        sourceMaps.forEach(sourceMap -> {
-            if (MapUtils.isNotEmpty(sourceMap)) {
-                Set<String> set = sourceMap.keySet();
-                List list = new ArrayList(set);
-                list.sort(new Comparator<String>() {
-                    @Override
-                    public int compare(String arg0, String arg1) {
-                        return arg0.compareTo(arg1);//这是顺序
-                    }
-                });
-                set = Sets.newLinkedHashSet(list);
-//                if (set.size() == 335) {
-//                    System.out.println(" ");
-//                    for (Map.Entry<Set<String>, String> entry : xmlDataTypeModuleInfo.entrySet()) {
-//                        System.out.println(StringUtils.join(entry.getKey(), ","));
-//                    }
-//                    System.out.println(StringUtils.join(set, ","));
-//                }
-                String modeId = xmlDataTypeModuleInfo.get(set);
-                if (StringUtil.isNotBlank(modeId)) {
-                    System.out.println("modeId :  " + modeId);
-                    sourceMap.put("mode_id", modeId);
-                }
-            }
-        });
-    }
-
-}

trans/src/main/java/com/lantone/qc/trans/comsis/ModuleMappingUtil.java

@@ -0,0 +1,45 @@
+package com.lantone.qc.trans.comsis;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.apache.commons.collections.MapUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Description: 页面模板映射工具类
+ * @author: rengb
+ * @time: 2020/4/30 10:03
+ */
+public class ModuleMappingUtil {
+
+    public static Map<Set<String>, String> xmlDataTypeModuleInfo = Maps.newLinkedHashMap();
+
+    public static String getXmlDataTypeModuleId(Map<String, String> sourceMap) {
+        if (MapUtils.isEmpty(sourceMap)) {
+            return null;
+        }
+        Set<String> set = sourceMap.keySet();
+        List list = new ArrayList(set);
+        list.sort(new Comparator<String>() {
+            @Override
+            public int compare(String arg0, String arg1) {
+                return arg0.compareTo(arg1);//这是顺序
+            }
+        });
+        set = Sets.newLinkedHashSet(list);
+        //                if (set.size() == 335) {
+        //                    System.out.println(" ");
+        //                    for (Map.Entry<Set<String>, String> entry : xmlDataTypeModuleInfo.entrySet()) {
+        //                        System.out.println(StringUtils.join(entry.getKey(), ","));
+        //                    }
+        //                    System.out.println(StringUtils.join(set, ","));
+        //                }
+        return xmlDataTypeModuleInfo.get(set);
+    }
+
+}

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -18,6 +18,10 @@ public class OrdinaryAssistant {
 
     public static Map<String, String> mapKeyContrast(Map<String, String> sourceMap, List<String> keyContrasts) {
         Map<String, String> retMap = Maps.newHashMap();
+        String modeId = ModuleMappingUtil.getXmlDataTypeModuleId(sourceMap);
+        if (StringUtil.isNotBlank(modeId)) {
+            retMap.put("mode_id", modeId);
+        }
         Map<String, String> sourceMap_ = MapUtil.copyMap((Map) sourceMap);
         String[] arry = null;
         String sourceKey = null, targetKey;