From 7bff807b82fc89d0c7f906185356023dc793fc28 Mon Sep 17 00:00:00 2001 From: zengwh Date: Fri, 24 Nov 2023 11:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=91=E5=9F=9F=E5=A4=96?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ann/demo/controller/TestController.java | 2 +- .../demo/entity/filing/dto/MessageDto.java | 2 + .../interfaces/config/WebServiceConfig.java | 8 +- .../com/ann/demo/service/AnalysisService.java | 4 +- .../ann/demo/service/CollectCheckService.java | 24 +++--- src/main/resources/application.yml | 11 ++- src/main/resources/logback-spring.xml | 80 ++++++++++--------- src/main/resources/templates/demo.html | 2 +- 8 files changed, 77 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/ann/demo/controller/TestController.java b/src/main/java/com/ann/demo/controller/TestController.java index 6f381dd..f8f940e 100644 --- a/src/main/java/com/ann/demo/controller/TestController.java +++ b/src/main/java/com/ann/demo/controller/TestController.java @@ -61,7 +61,7 @@ public class TestController { @RequestMapping("/demo1") @ResponseBody public String demo1() { - collectCheckService.downFileWithCheck("123","100041535327","GZ002WWRQAZEUXP","http://kmcs.kingmed.com.cn:8890/km-platform-web/restful/fileDownload/0df10c5e-af85-4acd-b2df-c1628f77b59c@88f14792ee4a31129fa721f85e2068bb"); + collectCheckService.downFileWithCheck("123","100041535327","GZ002WWRQAZEUXP","http://kmcs.kingmed.com.cn:8890/km-platform-web/restful/fileDownload/0df10c5e-af85-4acd-b2df-c1628f77b59c@88f14792ee4a31129fa721f85e2068bb","123"); return "demo1"; } } diff --git a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java index 70884a6..1747e55 100644 --- a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java +++ b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java @@ -1,6 +1,7 @@ package com.ann.demo.entity.filing.dto; import lombok.Data; +import lombok.ToString; import java.util.Date; @@ -9,6 +10,7 @@ import java.util.Date; * @Date 2019/7/9 16:50 * @Created by ljx */ +@ToString public class MessageDto { private String entity; diff --git a/src/main/java/com/ann/demo/interfaces/config/WebServiceConfig.java b/src/main/java/com/ann/demo/interfaces/config/WebServiceConfig.java index 4294b6d..fe26db8 100644 --- a/src/main/java/com/ann/demo/interfaces/config/WebServiceConfig.java +++ b/src/main/java/com/ann/demo/interfaces/config/WebServiceConfig.java @@ -44,16 +44,16 @@ public class WebServiceConfig { System.out.println("-----------------------LIS已发布-------------------------"); EndpointImpl endpoint = new EndpointImpl(springBus(), homepageDictionary()); endpoint.publish("HomepageDictionary"); + System.out.println("在线的wsdl:http://localhost:"+port+"/services/HomepageDictionary?wsdl"); + log.info("在线的wsdl:http://localhost:"+port+"/services{}?wsdl","/HomepageDictionary"); return endpoint; } - @Bean + /*@Bean public Endpoint userServiceEndpoint() { EndpointImpl userEndpoint = new EndpointImpl(bus, webServiceDemo); userEndpoint.publish(path); - System.out.println("在线的wsdl:http://localhost:"+port+"/services"+path+"?wsdl"); - log.info("在线的wsdl:http://localhost:"+port+"/services{}?wsdl",path); return userEndpoint; - } + }*/ } diff --git a/src/main/java/com/ann/demo/service/AnalysisService.java b/src/main/java/com/ann/demo/service/AnalysisService.java index ff67bc2..66a0924 100644 --- a/src/main/java/com/ann/demo/service/AnalysisService.java +++ b/src/main/java/com/ann/demo/service/AnalysisService.java @@ -72,6 +72,7 @@ public class AnalysisService { MessageLog messageLog = new MessageLog(message, InterfaceName.HIP_MESSAGE_SERVER, new Date(), webserviceId); messageService.save(messageLog); MessageDto messageDto = XMLUtils.xpathToBean(message, tClass, parameter); + logger.info("接收到信息："+messageDto.toString()); if (messageDto != null) { archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId()); if (archiveMasterId != null) { @@ -93,7 +94,7 @@ public class AnalysisService { }else{ interfaceFlag = true; //不是base64 2023-09-05新增，根据接口下载pdf - boolean downFileFlag = collectCheckService.downFileWithCheck(archiveMasterId,messageDto.getBarCode(),messageDto.getCheckReportId(), messageDto.getReportAddress()); + boolean downFileFlag = collectCheckService.downFileWithCheck(archiveMasterId,messageDto.getBarCode(),messageDto.getCheckReportId(), messageDto.getReportAddress(),messageDto.getApplyId()); if(!downFileFlag){ textContentTemp = "金域外送base64下载失败"; } @@ -136,6 +137,7 @@ public class AnalysisService { result = 1; } } else { + logger.info("患者不存在：住院号："+messageDto.getInpNo()+",住院次数："+messageDto.getVisitId()); textContent = "没有入院信息"; } } else { diff --git a/src/main/java/com/ann/demo/service/CollectCheckService.java b/src/main/java/com/ann/demo/service/CollectCheckService.java index 60c4f75..fffc26e 100644 --- a/src/main/java/com/ann/demo/service/CollectCheckService.java +++ b/src/main/java/com/ann/demo/service/CollectCheckService.java @@ -17,6 +17,8 @@ import javax.xml.rpc.encoding.XMLType; import org.apache.axis.client.Service; import org.apache.axis.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -35,7 +37,6 @@ import java.util.*; @Slf4j public class CollectCheckService { private Map tokenCacheMap = new HashMap<>(); - private String FILENAME = "fileName"; private String FILEBASE64 = "fileBase64"; @Value("${siteCode}") @@ -55,12 +56,12 @@ public class CollectCheckService { @Value("${downfileUrl}") private String downfileUrl; - public boolean downFileWithCheck(String masterId,String hospBarcode,String reportOdd,String fileUrl) { + public boolean downFileWithCheck(String masterId,String hospBarcode,String reportOdd,String fileUrl,String applyId) { //登录 String token = getTokenByCheckKey(siteCode, customerCode, collectionLocation); - System.out.println("获取token:"+token); + log.info("获取token:"+token); //下载 - return downFileWithCheck(masterId,hospBarcode,reportOdd,fileUrl,token); + return downFileWithCheck(masterId,hospBarcode,reportOdd,fileUrl,token,applyId); } /** @@ -72,7 +73,7 @@ public class CollectCheckService { * @param token * @return */ - private boolean downFileWithCheck(String masterId,String hospBarcode,String reportOdd,String fileUrl,String token){ + private boolean downFileWithCheck(String masterId,String hospBarcode,String reportOdd,String fileUrl,String token,String applyId){ //根据参数请求接口返回json数据 String result = reqInterfaceByParam(hospBarcode, reportOdd, fileUrl, token); //解析返回json数据 @@ -80,10 +81,11 @@ public class CollectCheckService { //唯一文件码 String serialnum = hospBarcode + "_" + reportOdd; //根据解析的数据调用下载 - String reqResult = downFile(masterId,map,serialnum); + String reqResult = downFile(masterId,map,serialnum,applyId); if(!StringUtils.isEmpty(reqResult)) { String code = JsonUtils.getValueByKey(reqResult, "code"); if(!StringUtils.isEmpty(code) && "0".equals(code)){ + log.info("下载成功：masterId："+masterId); return true; } } @@ -94,14 +96,13 @@ public class CollectCheckService { * 根据解析的数据调用下载 * @param map */ - private String downFile(String masterId,Map map,String serialnum) { + private String downFile(String masterId,Map map,String serialnum,String applyId) { if(!CollectionUtils.isEmpty(map)){ //设置下载参数 - Map rootMap = setDownReqParams(masterId, map, serialnum); + Map rootMap = setDownReqParams(masterId, map, serialnum,applyId); //调用下载接口 String result = HttpClientUtils.doPost(downfileUrl,JSON.toJSONString(rootMap)); log.info("上传下载服务result:"+result); - System.out.println("上传下载服务result:"+result); return result; } return null; @@ -114,7 +115,7 @@ public class CollectCheckService { * @param serialnum * @return */ - private Map setDownReqParams(String masterId, Map map, String serialnum) { + private Map setDownReqParams(String masterId, Map map, String serialnum,String applyId) { //设置文件信息参数 Map scanfilesMap = new HashMap<>(); scanfilesMap.put("taskid",-1); @@ -122,8 +123,9 @@ public class CollectCheckService { scanfilesMap.put("filesource",1); scanfilesMap.put("filestoragetype",1); scanfilesMap.put("filetype",2); + scanfilesMap.put("applyId",applyId); scanfilesMap.put("downurl", map.get(FILEBASE64)); - scanfilesMap.put("serialnum", serialnum +"1"); + scanfilesMap.put("serialnum", serialnum); List> scanfilesList = new ArrayList<>(); scanfilesList.add(scanfilesMap); //设置患者信息参数 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6bbc02d..dddb55f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,7 +15,7 @@ spring: url: jdbc:sqlserver://10.6.1.127:1433;DatabaseName=DB_PrivilegeManagement_GYFY #url: jdbc:sqlserver://localhost:1433;DatabaseName=zj_record_new username: sa - password: docus702 + password: docus@702 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver jpa: database: sql_server @@ -63,7 +63,13 @@ file: pdfPath: D:/project_js server: port: 8885 - +logging: + config : classpath:logback-spring.xml + level: + com.example.mapper: debug + file: + #日志文件位置 + name: D:/logs/toDayLog/log.log ################################################# #登录接口 #子公司代码 @@ -84,4 +90,5 @@ webServiceMethod: login webServiceDownMethod: downloadPictureInfo #调下载接口 +#downfileUrl: http://192.168.16.85:9292/api/downplatform/report downfileUrl: http://10.6.1.127:9291/api/downplatform/report diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 582bfff..2749f1e 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,47 +1,55 @@ - - - - logback - - - - - - - - - INFO - + + + + + + - - ${LOG_PATTERN} + [%d{yyyy-MM-dd' 'HH:mm:ss.sss}] [%contextName] [%thread] [%X{traceId}] %-5level %logger{36} - %msg%n + + UTF-8 - - - + + + + + D:/logs/toDayLog/log.log + + - ${FILE_PATH} - - 30 - - - 2MB + + + D:/logs/log/demo.%d.%i.log + + 15 + + + 10MB - - 1GB - ${LOG_PATTERN} + + + [%d{yyyy-MM-dd' 'HH:mm:ss.sss}] [%C] [%t] [%X{traceId}] [%L] [%-5p] %m%n + + utf-8 + + UTF-8 + 1024 - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/demo.html b/src/main/resources/templates/demo.html index aaa84da..144b9ae 100644 --- a/src/main/resources/templates/demo.html +++ b/src/main/resources/templates/demo.html @@ -14,7 +14,7 @@