Explorar el Código

AI接口配置修改

Zhaops hace 6 años
padre
commit
b9c7c696dd

+ 2 - 2
config-server/src/main/resources/shared/icss-service-dev.yml

@@ -98,7 +98,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
-ai:
+bigdata:
   server:
     address: http://192.168.2.234:5008
 
@@ -106,6 +106,6 @@ graph:
   server:
     address: http://192.168.2.234:5003
 
-symptom:
+nlp:
   server:
     address: http://192.168.2.234:5002

+ 3 - 3
config-server/src/main/resources/shared/icss-service-local.yml

@@ -98,7 +98,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
-ai:
+bigdata:
   server:
     address: http://192.168.2.234:5008
 
@@ -106,6 +106,6 @@ graph:
   server:
     address: http://192.168.2.234:5003
 
-symptom:
+nlp:
   server:
-    address: http://192.168.2.234:5002
+    address: http://192.168.2.234:5002

+ 2 - 3
config-server/src/main/resources/shared/icss-service-pro.yml

@@ -98,7 +98,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
-ai:
+bigdata:
   server:
     address: http://192.168.2.234:5008
 
@@ -106,7 +106,6 @@ graph:
   server:
     address: http://192.168.2.234:5003
 
-symptom:
+nlp:
   server:
     address: http://192.168.2.234:5002
-

+ 3 - 3
config-server/src/main/resources/shared/icss-service-test.yml

@@ -98,7 +98,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
-ai:
+bigdata:
   server:
     address: http://192.168.2.234:5008
 
@@ -106,6 +106,6 @@ graph:
   server:
     address: http://192.168.2.234:5003
 
-symptom:
+nlp:
   server:
-    address: http://192.168.2.234:5002
+    address: http://192.168.2.234:5002

+ 4 - 4
icss-service/src/main/java/com/diagbot/client/AIServiceClient.java

@@ -3,18 +3,18 @@ package com.diagbot.client;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.hystrix.AIServiceHystrix;
+import com.diagbot.client.hystrix.BigDataServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
- * @Description:
+ * @Description:调用大数据对接层服务
  * @Author:zhaops
  * @time: 2018/11/20 13:15
  */
-@FeignClient(name = "AI", url = "${ai.server.address}", fallback = AIServiceHystrix.class)
-public interface AIServiceClient {
+@FeignClient(name = "BigData", url = "${bigdata.server.address}", fallback = BigDataServiceHystrix.class)
+public interface BigDataServiceClient {
     @PostMapping(value = "/push-web/algorithm/neural")
     Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);
 }

+ 4 - 4
icss-service/src/main/java/com/diagbot/client/HighRiskServiceClient.java

@@ -3,18 +3,18 @@ package com.diagbot.client;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.hystrix.HighRiskServiceHystrix;
+import com.diagbot.client.hystrix.GraphServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
- * @Description:
+ * @Description:调用知识图谱对接层服务
  * @Author:zhaops
  * @time: 2018/12/21 11:38
  */
-@FeignClient(name = "HighRisk", url = "${graph.server.address}", fallback = HighRiskServiceHystrix.class)
-public interface HighRiskServiceClient {
+@FeignClient(name = "Graph", url = "${graph.server.address}", fallback = GraphServiceHystrix.class)
+public interface GraphServiceClient {
     @PostMapping(value = "/graph-web/graph/highRisk")
     Response<GdbResponse> highRiskPageData(@RequestBody SearchData searchData);
 }

+ 4 - 4
icss-service/src/main/java/com/diagbot/client/SymptomFeatureClient.java

@@ -1,7 +1,7 @@
 package com.diagbot.client;
 
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.hystrix.SymptomFeatureHystrix;
+import com.diagbot.client.hystrix.NLPServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -10,12 +10,12 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description:调用NLP对接层服务
  * @Author:zhaops
  * @time: 2019/2/26 10:33
  */
-@FeignClient(name = "SymptomFeature", url = "${symptom.server.address}", fallback = SymptomFeatureHystrix.class)
-public interface SymptomFeatureClient {
+@FeignClient(name = "NLP", url = "${nlp.server.address}", fallback = NLPServiceHystrix.class)
+public interface NLPServiceClient {
     @PostMapping(value = "/nlp-web/feature/find_symptom_feature")
     Response<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text);
 }

+ 4 - 4
icss-service/src/main/java/com/diagbot/client/hystrix/AIServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.client.AIServiceClient;
+import com.diagbot.client.BigDataServiceClient;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
@@ -8,16 +8,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
- * @Description:
+ * @Description:调用大数据对接层服务
  * @Author:zhaops
  * @time: 2018/11/20 13:15
  */
 @Component
 @Slf4j
-public class AIServiceHystrix implements AIServiceClient {
+public class BigDataServiceHystrix implements BigDataServiceClient {
     @Override
     public Response<ResponseData> bayesPageData(SearchData searchData) {
         log.error("【hystrix】调用{}异常", "bayesPageData");
         return null;
     }
-}
+}

+ 4 - 4
icss-service/src/main/java/com/diagbot/client/hystrix/HighRiskServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.client.HighRiskServiceClient;
+import com.diagbot.client.GraphServiceClient;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.SearchData;
@@ -8,16 +8,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
- * @Description:
+ * @Description:调用知识图谱对接层服务
  * @Author:zhaops
  * @time: 2018/12/21 11:48
  */
 @Component
 @Slf4j
-public class HighRiskServiceHystrix implements HighRiskServiceClient {
+public class GraphServiceHystrix implements GraphServiceClient {
     @Override
     public Response<GdbResponse> highRiskPageData(SearchData searchData) {
         log.error("【hystrix】调用{}异常", "highRiskPageData");
         return null;
     }
-}
+}

+ 5 - 5
icss-service/src/main/java/com/diagbot/client/hystrix/SymptomFeatureHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.client.SymptomFeatureClient;
+import com.diagbot.client.NLPServiceClient;
 import com.diagbot.client.bean.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -10,17 +10,17 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description:调用NLP对接层服务
  * @Author:zhaops
  * @time: 2019/2/26 10:33
  */
 @Component
 @Slf4j
-public class SymptomFeatureHystrix implements SymptomFeatureClient {
+public class NLPServiceHystrix implements NLPServiceClient {
 
     @Override
-    public  Response<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text) {
+    public Response<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text) {
         log.error("【hystrix】调用{}异常", "symptomFeaturePageData");
         return null;
     }
-}
+}

+ 3 - 3
icss-service/src/main/java/com/diagbot/facade/FeatureFacade.java

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.SymptomFeatureClient;
+import com.diagbot.client.NLPServiceClient;
 import com.diagbot.client.bean.Response;
 import com.diagbot.dto.SymptomFeatureDTO;
 import com.diagbot.entity.QuestionInfo;
@@ -25,7 +25,7 @@ import java.util.Map;
 @Component
 public class FeatureFacade {
     @Autowired
-    private SymptomFeatureClient symptomFeatureClient;
+    private NLPServiceClient NLPServiceClient;
     @Autowired
     private QuestionFacade questionFacade;
 
@@ -37,7 +37,7 @@ public class FeatureFacade {
      */
     public List<SymptomFeatureDTO> getSymptomFeature(String text) {
         List<SymptomFeatureDTO> symptomFeatureDTOList = Lists.newLinkedList();
-        Response<List<Map<String, Object>>> res = symptomFeatureClient.symptomFeaturePageData(text);
+        Response<List<Map<String, Object>>> res = NLPServiceClient.symptomFeaturePageData(text);
         if (null == res || null == res.getData()) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
         }

+ 6 - 6
icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -2,8 +2,8 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.AIServiceClient;
-import com.diagbot.client.HighRiskServiceClient;
+import com.diagbot.client.BigDataServiceClient;
+import com.diagbot.client.GraphServiceClient;
 import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.MedicalIndication;
@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 @Component
 public class PushFacade {
     @Autowired
-    private AIServiceClient aiServiceClient;
+    private BigDataServiceClient bigDataServiceClient;
     @Autowired
     private QuestionFacade questionFacade;
     @Autowired
@@ -71,7 +71,7 @@ public class PushFacade {
     @Autowired
     private TreatmentFacade treatmentFacade;
     @Autowired
-    private HighRiskServiceClient highRiskServiceClient;
+    private GraphServiceClient graphServiceClient;
     @Autowired
     private LisMappingFacade lisMappingFacade;
     @Autowired
@@ -135,7 +135,7 @@ public class PushFacade {
         searchData.setSysCode("1");
         searchData.setLength(10);
 
-        Response<ResponseData> res = aiServiceClient.bayesPageData(searchData);
+        Response<ResponseData> res = bigDataServiceClient.bayesPageData(searchData);
         if (null == res || null == res.getData()) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
         }
@@ -230,7 +230,7 @@ public class PushFacade {
             highRiskMap.put("disease", String.join(",", diseaseNameList));
             SearchData searchData = new SearchData();
             searchData.setDiag(String.join(",", diseaseNameList));
-            Response<GdbResponse> graphRes = highRiskServiceClient.highRiskPageData(searchData);
+            Response<GdbResponse> graphRes = graphServiceClient.highRiskPageData(searchData);
             if (graphRes != null) {
                 Map<String, String> graphResult = graphRes.getData().getResult();
                 if (graphResult.size() > 0) {