添加默认的分类id

src/main/java/com/docus/server/AppRunBootstrap.java

@@ -1,10 +1,12 @@
 package com.docus.server;
 
 
+import com.docus.server.report.config.SdRyReportQueryConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
 
 import java.util.Properties;
 
@@ -20,6 +22,8 @@ public class AppRunBootstrap {
         props.setProperty("org.apache.cxf.stax.allowInsecureParser", "1");
         props.setProperty("UseSunHttpHandler", "true");
         System.setProperty("javax.xml.parsers.DocumentBuilderFactory","com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
-        SpringApplication.run(AppRunBootstrap.class,args);
+        ConfigurableApplicationContext run = SpringApplication.run(AppRunBootstrap.class, args);
+        SdRyReportQueryConfig bean = run.getBean(SdRyReportQueryConfig.class);
+        bean.getReportQueryLisDefaultAssortType();
     }
 }

src/main/java/com/docus/server/report/config/SdRyReportQueryConfig.java

@@ -33,6 +33,8 @@ public class SdRyReportQueryConfig {
     private int reportQueryLisInterval;
     @Value("${sdry.report-query-url.lis.collectorId}")
     private String reportQueryLisCollectorId;
+    @Value("${sdry.report-query-url.lis.defaultAssortType:other}")
+    private String reportQueryLisDefaultAssortType;
 
 
     @Value("${sdry.report-query-url.inspect.url:}")
@@ -47,6 +49,8 @@ public class SdRyReportQueryConfig {
     private String reportQueryMzInspectCollectorId;
     @Value("${sdry.report-query-url.inspect.zy-collectorId}")
     private String reportQueryZyInspectCollectorId;
+    @Value("${sdry.report-query-url.inspect.defaultAssortType:other}")
+    private String reportQueryZyInspectDefaultAssortType;
 
 
     @Value("${sdry.report-query-url.nurseInsertSugar.url:}")
@@ -55,4 +59,6 @@ public class SdRyReportQueryConfig {
     private int reportQueryNurseInsertSugarInterval;
     @Value("${sdry.report-query-url.nurseInsertSugar.collectorId}")
     private String reportQueryNurseInsertSugarCollectorId;
+    @Value("${sdry.report-query-url.nurseInsertSugar.defaultAssortType:other}")
+    private String reportQueryNurseInsertSugarDefaultAssortType;
 }

src/main/java/com/docus/server/report/config/ZdAssortConfig.java

@@ -14,12 +14,23 @@ public class ZdAssortConfig {
      * @return 分类id
      */
     public static String getZdAssortId(String type) {
+       return getZdAssortId(type,DEFAULT_TYPE);
+    }
+
+    /**
+     * 获取配置文件中类型对应的分类id
+     *
+     * @param type 类型
+     * @param defaultType 类型查询为空，查询默认类型
+     * @return 分类id
+     */
+    public static String getZdAssortId(String type,String defaultType) {
         TableJsonRead jsonRead = new TableJsonRead();
         JSONObject tableTypeJson = jsonRead.Read("data-config", "js-table-type.json", JSONObject.class);
         String zdAssortId = tableTypeJson.getString(type);
-        // 如果未获取到，并且类型不是默认的其他分类id，则取默认其他分类id
-        if (Func.isBlank(zdAssortId) && !DEFAULT_TYPE.equals(type)) {
-            return getOtherAssortId();
+        // 如果未获取到，则取默认分类id
+        if (Func.isBlank(zdAssortId)) {
+            return tableTypeJson.getString(defaultType);
         }
         return zdAssortId;
     }

src/main/resources/bootstrap.yml

@@ -76,6 +76,7 @@ sdry:
       collectorId: -100
       url: http://192.168.0.200:8688/crHesb/hospital/common
       interval: 1000
+      defaultAssortType: hl-other