北仑兼容6.0

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

@@ -139,6 +139,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/graph/conceptInfo/staticKnowledgeIndex").permitAll()
                 .antMatchers("/graph/conceptInfo/staticKnowledgeIndexWithoutInfo").permitAll()
                 .antMatchers("/graph/conceptInfo/getStaticKnowledge").permitAll()
+                .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
                 .antMatchers("/graph/conceptInfo/getStaticKnowledgeForHIS").permitAll()
                 .antMatchers("/graph/conceptInfo/getPage").permitAll()
                 //.antMatchers("/graph/conceptInfo/saveOrUpdateRecord").permitAll()

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

@@ -181,6 +181,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/graph/conceptInfo/staticKnowledgeIndex", request)
                 || matchers("/graph/conceptInfo/staticKnowledgeIndexWithoutInfo", request)
                 || matchers("/graph/conceptInfo/getStaticKnowledge", request)
+                || matchers("/dataPage/docking/getStaticKnowledge", request)
                 || matchers("/graph/conceptInfo/getStaticKnowledgeForHIS", request)
                 || matchers("/graph/conceptInfo/getPage", request)
                 //|| matchers("/graph/conceptInfo/saveOrUpdateRecord", request)

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

@@ -11,11 +11,13 @@ 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 com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -39,6 +41,9 @@ public class DataPageDockFacade {
     @Autowired
     private DataDockingLogFacade dataDockingLogFacade;
 
+    @Value("${data-page.url}")
+    private String dataPageUrl;
+
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
         if(dataPageDockVO.getHospitalId()==null){
@@ -55,9 +60,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{
@@ -77,6 +82,21 @@ public class DataPageDockFacade {
         return RespDTO.onSuc(url);
     }
 
+    /**
+     * @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);
+    }
+
 
 
     public RespDTO<String> getDataService(DataPageDockNbrmVo dataPageDockNbrmVo) {

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

@@ -6,6 +6,7 @@ import com.diagbot.facade.DataPageDockFacade;
 import com.diagbot.vo.DataEngineVO;
 import com.diagbot.vo.DataPageDockNbrmVo;
 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;
@@ -44,6 +45,13 @@ 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]",
             notes = "")

src/main/resources/application-local.yml

@@ -181,3 +181,7 @@ mrqc:
 #CDSS核心地址
 cdss-core:
   url: http://10.48.45.180:7010
+
+  #页面推送模式地址配置
+data-page:
+  url: http://10.48.45.180:5654