From befeed1979c329ea06549dd24405d36d11eb59e6 Mon Sep 17 00:00:00 2001 From: zhanghai <120228220@qq.com> Date: Fri, 19 Jul 2024 08:50:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=202.?= =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E5=90=8C=E6=97=B6=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=82=E6=95=B0=E3=80=82=203.=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8A=E4=BC=A0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jiashi/FileUploader.java | 6 +- src/main/java/com/jiashi/dao/DataQuery.java | 2 +- .../java/com/jiashi/service/CardInfo.java | 12 ++++ .../com/jiashi/service/UpdateService.java | 38 +++++----- .../java/com/jiashi/service/UploadInfo.java | 17 ++++- src/main/resources/logback.xml | 69 +++++++++++++++++++ 6 files changed, 118 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/logback.xml diff --git a/src/main/java/com/jiashi/FileUploader.java b/src/main/java/com/jiashi/FileUploader.java index 5a1124a..bf6aeec 100644 --- a/src/main/java/com/jiashi/FileUploader.java +++ b/src/main/java/com/jiashi/FileUploader.java @@ -62,11 +62,11 @@ public class FileUploader { // 额外的表单字段参数 List params = new ArrayList<>(); - params.add(new FormField("uploadFileParams", "[ {\"inpatientNo\":\"35131\", \"disDate\":\"2020-07-30 00:00:00.000\", \"fileTitle\":\"16763947060057863381.jpg\", \"uploadFileName\":\"16763947060057863381.jpg\", \"assortId\":\"078F7675CB0048EDBE586D59831C57B0\" ,\n" + - "\"patientId\":\"12312312\",\n" + + params.add(new FormField("uploadFileParams", "[ {\"inpatientNo\":\"35132331\", \"admiss_id\":\"12312342342312\",\"admiss_times\":\"1\",\"disDate\":\"2020-07-30 00:00:00.000\", \"fileTitle\":\"16763947060057863381.jpg\", \"uploadFileName\":\"16763947060057863381.jpg\", \"assortId\":\"078F7675CB0048EDBE586D59831C57B0\" ,\n" + + "\"patientId\":\"12323432412312\",\n" + "\"name\":\"长三\",\n" + "\"admissDate\":\"2022-02-01\",\n" + - "\"sex\":\"男女\"\n" + + "\"sex\":\"男\"\n" + "}\n" + "]")); diff --git a/src/main/java/com/jiashi/dao/DataQuery.java b/src/main/java/com/jiashi/dao/DataQuery.java index fa63b4a..afaa5da 100644 --- a/src/main/java/com/jiashi/dao/DataQuery.java +++ b/src/main/java/com/jiashi/dao/DataQuery.java @@ -34,7 +34,7 @@ public class DataQuery { Sort.Order sortCreateTime = Sort.Order.asc("outdate"); Sort sort = Sort.by(sortCreateTime); - Pageable pageable = PageRequest.of(0, 100, sort); + Pageable pageable = PageRequest.of(0, 1000, sort); Page all = cardInfoRepository.findAll(specification, pageable); return all.toList(); } diff --git a/src/main/java/com/jiashi/service/CardInfo.java b/src/main/java/com/jiashi/service/CardInfo.java index cc7e062..25ee728 100644 --- a/src/main/java/com/jiashi/service/CardInfo.java +++ b/src/main/java/com/jiashi/service/CardInfo.java @@ -67,6 +67,18 @@ public class CardInfo { private String gestno; + public String getPatbirthdayStr(){ + if(this.patbirthday!=null){ + try{ + return MyDateUtil.dateToString(this.patbirthday,"yyyy-MM-dd"); + }catch (Exception e){ + return ""; + } + }else{ + return ""; + } + } + public String getOutdateStr(){ return MyDateUtil.dateToString(this.outdate,"yyyy-MM-dd"); } diff --git a/src/main/java/com/jiashi/service/UpdateService.java b/src/main/java/com/jiashi/service/UpdateService.java index 56857a0..e96884d 100644 --- a/src/main/java/com/jiashi/service/UpdateService.java +++ b/src/main/java/com/jiashi/service/UpdateService.java @@ -34,7 +34,7 @@ public class UpdateService { public void upload() { String uniUrl = "http://192.168.8.74"; List cardInfos = null; - ExecutorService executor2 = Executors.newFixedThreadPool(3); + ExecutorService executor2 = Executors.newFixedThreadPool(50); ExecutorService executor = Executors.newFixedThreadPool(30); do { try{ @@ -98,7 +98,7 @@ public class UpdateService { picture.getPickind(), cardInfo.getId(), cardInfo.getPatname(), cardInfo.getIndateStr(), cardInfo.getPatsex(),cardInfo.getPatnum(), cardInfo.getIcdecode11(),cardInfo.getIcdename11(), cardInfo.getMjwesticde(),cardInfo.getMjwestname(), - cardInfo.getOutdeptname(),cardInfo.getPatciticard(),cardInfo.getOutwardname(),cardInfo.getIndeptname(),cardInfo.getIndeptcode(),cardInfo.getGestno()); + cardInfo.getOutdeptname(),cardInfo.getPatciticard(),cardInfo.getOutwardname(),cardInfo.getIndeptname(),cardInfo.getIndeptcode(),cardInfo.getGestno(),cardInfo.getPatbirthdayStr()); uploadInfos.add(uploadInfo); } @@ -109,25 +109,23 @@ public class UpdateService { params.add(new FormField("uploadFileParams", s)); log.info("请求参数："+s); // 上传 -// try { -// CommonResult commonResult = FileUploader.uploadFilesWithParams(files, "http://10.2.130.59:8712/api/downplatform/fileUploadJpg", params); -// if(commonResult.getCode()==0){ -// dataQuery.updateBatchState(cardInfo,3); -// -// }else{ -// dataQuery.updateBatchState(cardInfo,4); -// log.error(commonResult.getMsg()); -// } -// dataQuery.updateBatchState(cardInfo,4); -// } catch (Exception e) { -// dataQuery.updateBatchState(cardInfo,4); -// log.error(e.getMessage(),e); -// } - dataQuery.updateBatchState(cardInfo,4); + try { + CommonResult commonResult = FileUploader.uploadFilesWithParams(files, "http://192.168.161.102:9511/fileUploadJpg", params); + if(commonResult.getCode()==0){ + dataQuery.updateBatchState(cardInfo,3); + + }else{ + dataQuery.updateBatchState(cardInfo,4); + log.error(commonResult.getMsg()); + } + dataQuery.updateBatchState(cardInfo,4); + } catch (Exception e) { + dataQuery.updateBatchState(cardInfo,4); + log.error(e.getMessage(),e); + } // 删除文件 -// String dir = "d:\\pic\\"+cardInfo.getId(); -// File file = new File(dir); -// FileUploader.deleteFolder(file); + File file = new File(dir); + FileUploader.deleteFolder(file); }catch (Exception e){ dataQuery.updateBatchState(cardInfo,4); log.error(e.getMessage(),e); diff --git a/src/main/java/com/jiashi/service/UploadInfo.java b/src/main/java/com/jiashi/service/UploadInfo.java index 5fe5ee4..642582b 100644 --- a/src/main/java/com/jiashi/service/UploadInfo.java +++ b/src/main/java/com/jiashi/service/UploadInfo.java @@ -3,6 +3,8 @@ package com.jiashi.service; import lombok.AllArgsConstructor; import lombok.Data; +import java.util.Date; + /** * [ {"inpatientNo":"35131", "disDate":"2020-07-30 00:00:00.000", "fileTitle":"0001.jpg", "uploadFileName":"1.jpg", "assortId":"078F7675CB0048EDBE586D59831C57B0" , * "patientId":"12312312", @@ -47,9 +49,11 @@ public class UploadInfo { private String admissId; + private String birthday; + public UploadInfo(String inpatientNo, String disDate, String fileTitle, String uploadFileName, String assortId, String patientId, String name, String admissDate, String sex,Integer admissTimes,String mainDiagCode,String mainDiagName, String mainOperateCode,String mainOperateName, - String disDeptName,String idCard,String wardPalce,String admissDeptName,String admissDept,String admissId) { + String disDeptName,String idCard,String wardPalce,String admissDeptName,String admissDept,String admissId,String birthday) { this.inpatientNo = inpatientNo; this.disDate = disDate; this.fileTitle = fileTitle; @@ -58,7 +62,6 @@ public class UploadInfo { this.patientId = patientId; this.name = name; this.admissDate = admissDate; - this.sex = sex; this.admissTimes = admissTimes; this.mainOperateName = mainOperateName; this.mainDiagCode = mainDiagCode; @@ -70,10 +73,20 @@ public class UploadInfo { this.admissDeptName = admissDeptName; this.admissDept = admissDept; this.admissId = admissId; + this.birthday = birthday; this.ssAssortId(); + this.changeSexName(sex); } + public void changeSexName(String sex){ + if("1".equals(sex)){ + this.sex = "男"; + }else{ + this.sex = "女"; + } + } + public void ssAssortId() { switch (assortId) { case "1": diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..1a5a036 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + ${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} [${HOSTNAME}]${LOG_LEVEL_PATTERN:-%5p} ${PID:- } + --- [%t] %-40.40logger{39} %L : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}} + + UTF-8 + + + log/discovery-%d{yyyy-MM-dd}.%i.log + 50MB + + + debug + + + true + + + + 0 + 512 + + + + + + + + ${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} + [${HOSTNAME}]%clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} + %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %L %clr(:){faint} + %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}} + + UTF-8 + + + + debug + + + + + + + + + + + + + + + + + + + \ No newline at end of file