From d8bafa63f0720950a602b51b498e1237dbc89ff8 Mon Sep 17 00:00:00 2001 From: wzqgit <568275241@qq.com> Date: Wed, 26 May 2021 11:15:35 +0800 Subject: [PATCH] 0526 -wzq --- ScanningFile.iml | 5 + pom.xml | 22 +++ .../ann/demo/controller/TestController.java | 33 ++-- .../com/ann/demo/job/SchedulerAllJob.java | 2 +- .../com/ann/demo/service/AnalysisService.java | 53 +++++- .../java/com/ann/demo/utils/PdfUtils.java | 7 +- src/main/java/com/ann/demo/utils/Test.java | 7 + .../com/ann/demo/utils/WebServiceUtil.java | 158 ++++++++++++++++++ 8 files changed, 270 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/ann/demo/utils/Test.java create mode 100644 src/main/java/com/ann/demo/utils/WebServiceUtil.java diff --git a/ScanningFile.iml b/ScanningFile.iml index dae01f9..90173c7 100644 --- a/ScanningFile.iml +++ b/ScanningFile.iml @@ -153,5 +153,10 @@ + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index b310813..a2ea625 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,28 @@ 3.8 + + + org.apache.httpcomponents + httpclient + 4.5.2 + + + + + org.apache.axis + axis + 1.4 + + + + + javax.xml.rpc + javax.xml.rpc-api + 1.1.2 + + + diff --git a/src/main/java/com/ann/demo/controller/TestController.java b/src/main/java/com/ann/demo/controller/TestController.java index 56853e0..1d4973a 100644 --- a/src/main/java/com/ann/demo/controller/TestController.java +++ b/src/main/java/com/ann/demo/controller/TestController.java @@ -1,11 +1,19 @@ package com.ann.demo.controller; import com.ann.demo.entity.constant.InterfaceName; +import com.ann.demo.primaryEntity.ScanningFile; +import com.ann.demo.primaryRepository.ScanningFileRepository; +import com.ann.demo.service.AnalysisService; import org.apache.cxf.endpoint.Client; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.time.LocalDateTime; +import java.util.List; import java.util.Objects; /** @@ -16,6 +24,14 @@ import java.util.Objects; @RequestMapping("/") public class TestController { + final Logger logger = LoggerFactory.getLogger(TestController.class); + + @Autowired + private ScanningFileRepository scanningFileRepository ; + + @Autowired + private AnalysisService analysisService; + @RequestMapping("/demo") public String aa() { return "demo"; @@ -47,17 +63,14 @@ public class TestController { return "redirect:/demo"; } - @RequestMapping("/bb") + @RequestMapping("/aa") public String cc() { - JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); - Client client = dcf.createClient("http://localhost:8080/services/HomepageDictionary?wsdl"); - Object[] objects = new Object[0]; - try { - String outContent = "1.CDP2018102209193920180907112152"; - objects = client.invoke("ScanningFile", outContent); - } catch (Exception e) { - e.printStackTrace(); - } + LocalDateTime beginTime = LocalDateTime.now(); + logger.error("开始时间:"+beginTime); + List scanningFiles = scanningFileRepository.findScanningFiles(); + analysisService.handleScanningFile(scanningFiles); + LocalDateTime endTime = LocalDateTime.now(); + logger.error("结束时间:"+endTime); return "成功"; } diff --git a/src/main/java/com/ann/demo/job/SchedulerAllJob.java b/src/main/java/com/ann/demo/job/SchedulerAllJob.java index 8aab81e..0d73307 100644 --- a/src/main/java/com/ann/demo/job/SchedulerAllJob.java +++ b/src/main/java/com/ann/demo/job/SchedulerAllJob.java @@ -42,7 +42,7 @@ public class SchedulerAllJob { */ public void scheduleJobs() throws SchedulerException { Scheduler scheduler = schedulerFactoryBean.getScheduler(); -// scheduleJob1(scheduler); + scheduleJob1(scheduler); } /** diff --git a/src/main/java/com/ann/demo/service/AnalysisService.java b/src/main/java/com/ann/demo/service/AnalysisService.java index 3515089..730341c 100644 --- a/src/main/java/com/ann/demo/service/AnalysisService.java +++ b/src/main/java/com/ann/demo/service/AnalysisService.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Component; import java.io.File; import java.text.ParsePosition; import java.text.SimpleDateFormat; +import java.time.Duration; import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -53,6 +54,8 @@ public class AnalysisService { private ArchiveMasterService archiveMasterService; public void handleScanningFile(List scanningFileList) { + LocalDateTime beginTime = LocalDateTime.now(); + logger.error("开始时间:"+beginTime); //处理ScanningFile\ for (ScanningFile scanningFile: scanningFileList) { String remark = null; @@ -72,25 +75,56 @@ public class AnalysisService { scanningFile.setRemark(remark); scanningFile.setStatus(status); scanningFileRepository.save(scanningFile); + + LocalDateTime handleTime = LocalDateTime.now(); + logger.error("每一条处理时间:"+handleTime); } + LocalDateTime endTime = LocalDateTime.now(); + logger.error("结束时间:"+endTime); } public String handlePdfFile(ScanningFile scanningFile) throws Exception{ //处理ScanningFile // 判断病案首页数据是否存在 + + LocalDateTime now1 = LocalDateTime.now();//删掉 CommonTable commonTable = commonTableRepository.findByInpNoAndVisitId(scanningFile.getInpNo(), scanningFile.getVisitId()); + LocalDateTime end1 = LocalDateTime.now();//删掉 + logger.error("判断病案首页数据是否存在耗时:"+Duration.between(now1,end1).toMillis());//删掉 + if(commonTable == null){ String masterId = scanningFile.getApplyId() != null ? scanningFile.getApplyId() : UUID.randomUUID().toString(); commonTable = new CommonTable(masterId,scanningFile.getPatientId(),scanningFile.getAge(),scanningFile.getSex(),scanningFile.getVisitId(),scanningFile.getName(), scanningFile.getAdmissDate(),scanningFile.getDisDate(),scanningFile.getDisDept(),scanningFile.getAttending(),scanningFile.getInpNo(),"扫描系统"); // //保存公共表 + LocalDateTime now2 = LocalDateTime.now();//删掉 commonTableRepository.save(commonTable); + LocalDateTime end2 = LocalDateTime.now();//删掉 + logger.error("保存公共表耗时:"+Duration.between(now2,end2).toMillis());//删掉 //保存公共表1 + LocalDateTime now3 = LocalDateTime.now();//删掉 commonTable1Repository.save( new CommonTable1(commonTable.getMasterId(),scanningFile.getBirthday(),scanningFile.getIdCard(),scanningFile.getAdmissDept(),scanningFile.getAdmissDoctor())); + LocalDateTime end3 = LocalDateTime.now();//删掉 + logger.error("保存公共表1耗时:"+Duration.between(now3,end3).toMillis());//删掉 } - Object[] objects = WebServiceUtils.connect(scanningFile.getPath() + "\\" + scanningFile.getFileName()); + LocalDateTime now4 = LocalDateTime.now();//删掉 + //Object[] objects = WebServiceUtils.connect(scanningFile.getPath() + "\\" + scanningFile.getFileName()); + //Object[] objects = WebServiceUtil.urlConnectionUtil("http://10.6.0.224/cdms/cdmsservice.asmx?wsdl",scanningFile.getPath() + "\\" + scanningFile.getFileName()); + //使用HttpURLConnection方式连接 + String s = WebServiceUtil.urlConnectionUtil("http://10.6.0.224/cdms/cdmsservice.asmx?wsdl", scanningFile.getPath() + "\\" + scanningFile.getFileName()); + + LocalDateTime end4 = LocalDateTime.now();//删掉 + logger.error("WebServiceUtils.connect耗时:"+Duration.between(now4,end4).toMillis());//删掉 + //s转Object[] + String[] strArr = s.split(",");//注意分隔符是需要转译 + Object[] objects = new Object[strArr.length]; + for(int i=0;i