对接API-页面推送模式，增加静态知识功能

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -162,6 +162,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/demo/mrtestInfo/exportExcel").permitAll()
                 .antMatchers("/demo/mrtestInfo/mrTestProcess").permitAll()
                 .antMatchers("/dataPage/docking/getDataService").permitAll()
+                .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
                 .antMatchers("/dataPage/docking/getDataEngine").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -204,6 +204,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/demo/mrtestInfo/exportExcel", request)
                 || matchers("/demo/mrtestInfo/mrTestProcess", request)
                 || matchers("/dataPage/docking/getDataService", request)
+                || matchers("/dataPage/docking/getStaticKnowledge", request)
                 || matchers("/dataPage/docking/getDataEngine", request)
                 || matchers("/", request)) {
             return true;

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -7,10 +7,11 @@ import com.diagbot.dto.PushPlanDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TranDatadockingLog;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.HttpUtils;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -33,6 +34,29 @@ public class DataPageDockFacade {
     @Autowired
     private DataDockingLogFacade dataDockingLogFacade;
 
+    @Value("${data-page.url}")
+    private String dataPageUrl;
+
+    /**
+     * @Description:静态知识开单合理性
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO<String> getStaticKnowledge(StaticKnowledgeHISVO staticKnowledgeHISVO){
+        String url=dataPageUrl+"/informationOut.html?hospitalId="+staticKnowledgeHISVO.getHospitalId()
+                +"&type="+staticKnowledgeHISVO.getType()
+                +"&hisName="+staticKnowledgeHISVO.getHisName();
+        if(StringUtil.isNotEmpty(staticKnowledgeHISVO.getHisDetailName())){
+            url+="&hisDetailName="+staticKnowledgeHISVO.getHisDetailName();
+        }
+        return RespDTO.onSuc(url);
+    }
+
+    /**
+     * @Description:页面推送模式
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
         if(dataPageDockVO.getHospitalId()==null){
@@ -49,9 +73,9 @@ public class DataPageDockFacade {
         // 将基本参数保存到redis
         String mrId = mrFacade.createMr(pushJoinVO);
         if("hor".equals(dataPageDockVO.getShowType())){
-            url="http:/"+HttpUtils.getIpAddress()+":5654/cdssHorizontal.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
+            url=dataPageUrl+"/cdssHorizontal.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
         }else{
-            url="http:/"+HttpUtils.getIpAddress()+":5654/cdss.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
+            url=dataPageUrl+"/cdss.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
         }
 
         try{

src/main/java/com/diagbot/web/DataPageDockController.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DataPageDockFacade;
 import com.diagbot.vo.DataEngineVO;
 import com.diagbot.vo.DataPageDockVO;
+import com.diagbot.vo.StaticKnowledgeHISVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.formula.functions.T;
@@ -26,7 +27,7 @@ public class DataPageDockController {
     @Autowired
     private DataPageDockFacade dataPageDockFacade;
 
-    @ApiOperation(value = "页面推送模式-对接API[zhaops]",
+    @ApiOperation(value = "页面推送模式-推理API[QQ]",
             notes = "")
     @PostMapping("/getDataService")
     @SysLogger("getDataService")
@@ -34,8 +35,15 @@ public class DataPageDockController {
         return dataPageDockFacade.getDataService(dataPageDockVO);
     }
 
+    @ApiOperation(value = "页面推送模式-静态知识API[QQ]",
+            notes = "")
+    @PostMapping("/getStaticKnowledge")
+    @SysLogger("getStaticKnowledge")
+    public RespDTO<String> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeHISVO staticKnowledgeHISVO){
+        return dataPageDockFacade.getStaticKnowledge(staticKnowledgeHISVO);
+    }
 
-    @ApiOperation(value = "数据引擎模式-对接API[zhaops]",
+    @ApiOperation(value = "数据引擎模式-对接API[QQ]",
             notes = "")
     @PostMapping("/getDataEngine")
     @SysLogger("getDataEngine")

src/main/resources/application-dev.yml

@@ -180,4 +180,8 @@ mrqc:
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.236:7010
+  url: http://192.168.2.236:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://127.0.0.1:5654

src/main/resources/application-local.yml

@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://localhost:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.122:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息
@@ -113,7 +113,7 @@ spring:
       token: 15 # Token索引
       mr: 15 # 病历索引
     host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
@@ -181,3 +181,7 @@ mrqc:
 #CDSS核心地址
 cdss-core:
   url: http://192.168.2.236:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://192.168.2.122:5654

src/main/resources/application-pre.yml

@@ -180,4 +180,8 @@ mrqc:
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.121:7010
+  url: http://192.168.2.121:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://127.0.0.1:5654

src/main/resources/application-pro.yml

@@ -180,4 +180,8 @@ mrqc:
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.122:7010
+  url: http://192.168.2.122:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://127.0.0.1:5654

src/main/resources/application-test.yml

@@ -180,4 +180,8 @@ mrqc:
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.241:7010
+  url: http://192.168.2.241:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://127.0.0.1:5654