瀏覽代碼

通用版接口

lantone 5 年之前
父節點
當前提交
f70f2dfaa5

+ 42 - 12
src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade.data;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
@@ -13,6 +14,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.AnalyzeApiVO;
+import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.data.AHomeDiagnoseVO;
 import com.diagbot.vo.data.AHomeOperationVO;
 import com.diagbot.vo.data.AHomePageIngVO;
@@ -48,6 +50,18 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     private TZDBConn tzDBConn = new TZDBConn();
 
+    /*public static void main(String[] args){
+        int mod=Math.floorMod(5012,500);
+        int div=Math.floorDiv(5012,500);
+        if(mod!=0){
+            div+=1;
+        }
+        System.out.println(mod+"---"+div);
+        for (int i = 0; i < div; i++) {
+            System.out.println((i*500)+"---"+(i+1)*500);
+        }
+    }*/
+
     /**
      * 同步前一天病案首页
      */
@@ -56,6 +70,15 @@ public class AHomePageFacade extends HomePageServiceImpl{
         //同步前一天的数据
         String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
         List<HomePage> homePageList = tzDBConn.getHomePage(sql);
+        /*
+        int mod=Math.floorMod(homePageList.size(),500);
+        int div=Math.floorDiv(homePageList.size(),500);
+        for (int i = 0; i <= homePageList.size(); i++) {
+            System.out.println((i-1)*500+"---"+(i*500));
+            homePageList=homePageList.subList((i*500),(i+1)*500);
+            execute(homePageList);
+        }
+        */
         execute(homePageList);
     }
 
@@ -147,23 +170,30 @@ public class AHomePageFacade extends HomePageServiceImpl{
             map.put("url",url);
             return RespDTO.onSuc(map);
         }else if(aHomePageIngVO.getDockModeType().equals("2")){
-            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-            analyzeApiVO.setBehospitalCode(behospitalCode);
-            analyzeApiVO.setHospitalId(hospitalId);
-            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
-            //接口引擎模式
+            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+            analyzeRunVO.setBehospitalCode(behospitalCode);
+            analyzeRunVO.setHospitalId(hospitalId);
+            analyzeRunVO.setModeId(modeId);
+            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+            Map<String,Object> map=new HashMap<String,Object>();
+            if(analyzeRunDTO.getMsgDTOList().size()>0){
+                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+            }
             return RespDTO.onSuc(map);
         }else{
             //页面模式+接口引擎模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
 
-            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-            analyzeApiVO.setBehospitalCode(behospitalCode);
-            analyzeApiVO.setHospitalId(hospitalId);
-            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
-
-            map.put("url",url);
-
+            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+            analyzeRunVO.setBehospitalCode(behospitalCode);
+            analyzeRunVO.setHospitalId(hospitalId);
+            analyzeRunVO.setModeId(modeId);
+            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+            Map<String,Object> map=new HashMap<String,Object>();
+            if(analyzeRunDTO.getMsgDTOList().size()>0){
+                map.put("url",url);
+                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+            }
             return RespDTO.onSuc(map);
         }
     }

+ 21 - 11
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade.data;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
@@ -16,6 +17,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.AnalyzeApiVO;
+import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;
 import com.google.common.collect.Lists;
@@ -162,10 +164,15 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             map.put("url",url);
             return RespDTO.onSuc(map);
         }else if(aMrContentVO.getDockModeType().equals("2")){
-            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-            analyzeApiVO.setBehospitalCode(behospitalCode);
-            analyzeApiVO.setHospitalId(hospitalId);
-            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
+            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+            analyzeRunVO.setBehospitalCode(behospitalCode);
+            analyzeRunVO.setHospitalId(hospitalId);
+            analyzeRunVO.setModeId(modeId);
+            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+            Map<String,Object> map=new HashMap<String,Object>();
+            if(analyzeRunDTO.getMsgDTOList().size()>0){
+                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+            }
             //接口引擎模式
             return RespDTO.onSuc(map);
         }else{
@@ -175,13 +182,16 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
 
-            AnalyzeApiVO analyzeApiVO=new AnalyzeApiVO();
-            analyzeApiVO.setBehospitalCode(behospitalCode);
-            analyzeApiVO.setHospitalId(hospitalId);
-            Map<String, Object> map=behospitalInfoFacade.analyzeApi(analyzeApiVO);
-
-            map.put("url",url);
-
+            AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+            analyzeRunVO.setBehospitalCode(behospitalCode);
+            analyzeRunVO.setHospitalId(hospitalId);
+            analyzeRunVO.setModeId(modeId);
+            AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
+            Map<String,Object> map=new HashMap<String,Object>();
+            if(analyzeRunDTO.getMsgDTOList().size()>0){
+                map.put("url",url);
+                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+            }
             return RespDTO.onSuc(map);
         }
     }

+ 2 - 2
src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5959
+  port: 5858
   max-http-header-size: 10MB
 
 hystrix:
@@ -58,7 +58,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.100.157:3306/qq_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.100.157:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息