新增json文件

.gitignore

@@ -0,0 +1,35 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.iml
+# 直接在这里添加即可，注意加上备注，好知道是忽略什么文件 #
+
+##############################
+## Folders                  ##
+##############################
+target
+out
+log
+configLog
+.idea
+.project
+**/.mvn
+**/mvnw
+**/mvnw.cmd

dataConfig/homeQualitySet.json

@@ -40,6 +40,6 @@
   //采集日期
   "startCollectTime":"2016-04-11",
   //是否开启全量采集 1:是 0 :否
-  "isStartCollect":"0"
+  "isStartCollect":"1"
 
 }

src/main/java/com/docus/bgts/config/MyConstruct.java

@@ -6,7 +6,6 @@ import com.docus.bgts.utils.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 

src/main/java/com/docus/bgts/config/MyScheduling.java

@@ -26,10 +26,10 @@ public class MyScheduling {
     //5分钟执行一次
     @Scheduled(fixedRate = 1000 * 60 * 5)
     public void beat() {
-        String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
-        if(collectorid.equals(Codes.SMCODE.getCode())){
-            return;
-        }
+//        String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
+//        if(collectorid.equals(Codes.SMCODE.getCode())){
+//            return;
+//        }
         Map<String, String> params = new HashMap<>();
         params.put("code", String.valueOf(FileUtils.getJsonByName("collectorid")));
         try {
@@ -47,6 +47,10 @@ public class MyScheduling {
     @Scheduled(fixedRate = 1000 * 60 * 10)
     public void collect(){
         String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
+        String isStartCollect = String.valueOf(FileUtils.getJsonByName("isStartCollect"));
+        if(isStartCollect.equals("0")){
+            return;
+        }
         if(!collectorid.equals(Codes.SMCODE.getCode())){
             return;
         }

src/main/java/com/docus/bgts/service/BgtsServiceImpl.java

@@ -78,7 +78,7 @@ public class BgtsServiceImpl implements IBgtsService {
     }
 
     @Override
-    public void collectAll() {
+    public  void collectAll() {
         logger.info("----------全量采集开始-----------");
         //1.获取最早采集日期
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -118,6 +118,7 @@ public class BgtsServiceImpl implements IBgtsService {
         for (current = 1; ; current++) {
             size = 10 * current;
             vDocumentPdfs = vDocumentPdfMapper.listCollectPage(current, size, startDate, endDate);
+            logger.info("处理采集数据："+vDocumentPdfs);
             if (null == vDocumentPdfs || vDocumentPdfs.size() <= 0) {
                 break;
             }
@@ -148,6 +149,7 @@ public class BgtsServiceImpl implements IBgtsService {
                         throw new RuntimeException(String.valueOf(resMap.get("msg")));
                     }
                 } catch (Exception e) {
+                    logger.info("手麻采集出错："+reportDownDto);
                     addMrReportErrorLog(reportDownDto);
                     e.printStackTrace();
                 }

src/main/java/com/docus/bgts/web/MyFilter.java

@@ -18,10 +18,10 @@ public class MyFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        logger.info("拦截开始");
+        logger.info("------拦截开始------");
         String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
         if(collectorid.equals(Codes.SMCODE.getCode())){
-            logger.info("当前请求已被拦截...");
+            logger.info("-----当前请求已被拦截...------");
         }else {
             filterChain.doFilter(servletRequest,servletResponse);
         }

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9303
+  port: 9306
 #  http
 
 mybatis-plus:

src/main/resources/mapper/dboracle/VDocumentPdfMapper.xml

@@ -14,14 +14,13 @@
         FROM
         (
         SELECT
-        "DOCUS"."v_document_pdf"."手术申请单号",
-	    "DOCUS"."v_document_pdf"."文书名",
-	    "DOCUS"."v_document_pdf"."WEB_ADDRESS",
-	    "DOCUS"."v_document_pdf"."PATIENT_ID",
-	    "DOCUS"."v_document_pdf"."ARCHIVE_DATE_TIME",
-	    ROWID "NAVICAT_ROWID"
+        "DOCUS"."V_DOCUMENT_PDF"."手术申请单号",
+	    "DOCUS"."V_DOCUMENT_PDF"."文书名",
+	    "DOCUS"."V_DOCUMENT_PDF"."WEB_ADDRESS",
+	    "DOCUS"."V_DOCUMENT_PDF"."PATIENT_ID",
+	    "DOCUS"."V_DOCUMENT_PDF"."ARCHIVE_DATE_TIME"
         FROM
-        "DOCUS"."v_document_pdf"
+        "DOCUS"."V_DOCUMENT_PDF"
         WHERE
         "ARCHIVE_DATE_TIME" BETWEEN TO_DATE ( #{startTime}, 'YYYY-MM-DD HH24:MI:SS' )
         AND TO_DATE ( #{endTime}, 'YYYY-MM-DD HH24:MI:SS' )