检验的api改造

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/ThyyThirdpartApiApplication.java

@@ -7,9 +7,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @ComponentScan("org.thyy.*")
 public class ThyyThirdpartApiApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(ThyyThirdpartApiApplication.class, args);
     }
-
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionController.java

@@ -3,6 +3,8 @@ package org.thyy.thirdpartapi.inspection;
 import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,31 +21,23 @@ import java.util.Map;
 @RestController
 @RequestMapping("/inspection")
 public class InspectionController {
-    private final Map<String, InspectionInterface> serviceMap;
-    private final InspectionApi inspectionApi;
-    private InspectionInterface service;
-
-    @Autowired
-    public InspectionController(Map<String, InspectionInterface> serviceMap, InspectionApi inspectionApi) {
-        this.serviceMap = serviceMap;
-        this.inspectionApi = inspectionApi;
+    private final InspectionInterface service;
+
+    public InspectionController(InspectionInterface service) {
+        this.service = service;
     }
 
-    @PostConstruct
-    public void init() {
-        for (Map.Entry<String, InspectionInterface> map : serviceMap.entrySet()) {
-            String key = map.getKey();
-            if (inspectionApi.getConfig() == null) {
-                return;
-            }
-            InspectionApi.Config config = inspectionApi.getConfig().get(key);
-            if (config != null) {
-                try {
-                    map.getValue().init(inspectionApi, config);
-                    service = map.getValue();
-                } catch (Exception ignore) {}
-                return;
-            }
+    @Service
+    @ConditionalOnProperty(prefix = "thyy.inspection", name = "service", havingValue = "default", matchIfMissing = true)
+    static class Default implements InspectionInterface {
+        @Override
+        public List<JyIndexResponse> queryExamIndex(JSONObject request) {
+            return List.of();
+        }
+
+        @Override
+        public JyDetailResponse queryExamDetail(JSONObject request) {
+            return null;
         }
     }
 

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionInterface.java

@@ -9,13 +9,9 @@ import java.util.List;
 
 /**
  * 查询检验结果
- * */
+ */
 public interface InspectionInterface {
 
-    default void init(InspectionApi inspectionApi, InspectionApi.Config config) {
-
-    }
-
     List<JyIndexResponse> queryExamIndex(JSONObject request);
 
     JyDetailResponse queryExamDetail(JSONObject request);

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/config/InspectionApi.java

@@ -8,11 +8,8 @@ import java.util.Map;
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "thyy.api.inspection")
+@ConfigurationProperties(prefix = "thyy.inspection")
 public class InspectionApi {
-    @Data
-    public static class Config {
-        private String jy;
-    }
-    private Map<String, Config> config;
+    private String jy;
+    private String service;
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/inspectionImpl/ThyyInspectionImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.thyy.thirdpartapi.inspection.InspectionInterface;
@@ -17,19 +18,22 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
-@Service(value = "csth")
+@Service
+@ConditionalOnProperty(prefix = "thyy.inspection", name = "service", havingValue = "shanghaihaotai")
 public class ThyyInspectionImpl implements InspectionInterface {
     private String api;
     private final RestTemplate restTemplate;
+    private final InspectionApi inspectionApiConfig;
 
     @Autowired
-    public ThyyInspectionImpl( RestTemplate restTemplate) {
+    public ThyyInspectionImpl(RestTemplate restTemplate, InspectionApi inspectionApiConfig) {
         this.restTemplate = restTemplate;
+        this.inspectionApiConfig = inspectionApiConfig;
+        init();
     }
 
-    @Override
-    public void init(InspectionApi inspectionApi, InspectionApi.Config config) {
-        this.api = config.getJy();
+    public void init( ) {
+        this.api = inspectionApiConfig.getJy();
         log.info("检验检查模块初始化完成");
     }
 

thyy-thirdpart-api/src/main/resources/application.yml

@@ -15,9 +15,6 @@ thyy:
     app-id: fdde4cef
     api-key: 95a78dd3cfcc4863e3c003352ca8ec65
     api-secret: OWZjZGE4NjI3MDdkYzg4ZjllY2VjNGQ0
-
-  api:
-    inspection:
-      config:
-        csth:
-          jy: http://172.16.32.178/apis/third/report/query
+  inspection:
+    jy: http://172.16.32.178/apis/third/report/query
+#    service: shanghaihaotai