diff --git a/src/main/java/com/jiashi/FileUploader.java b/src/main/java/com/jiashi/FileUploader.java index 8114f59..5a1124a 100644 --- a/src/main/java/com/jiashi/FileUploader.java +++ b/src/main/java/com/jiashi/FileUploader.java @@ -71,10 +71,11 @@ public class FileUploader { "]")); // 上传URL - String uploadUrl = "http://192.168.16.116:8711/api/downplatform/fileUploadJpg"; + String uploadUrl = "http://192.168.16.116:9511/fileUploadJpg"; // 执行批量上传 - uploadFilesWithParams(files, uploadUrl, params); + CommonResult commonResult = uploadFilesWithParams(files, uploadUrl, params); + System.out.println(new Gson().toJson(commonResult)); } diff --git a/src/main/java/com/jiashi/service/CardInfo.java b/src/main/java/com/jiashi/service/CardInfo.java index 79b8cf3..cc7e062 100644 --- a/src/main/java/com/jiashi/service/CardInfo.java +++ b/src/main/java/com/jiashi/service/CardInfo.java @@ -64,6 +64,8 @@ public class CardInfo { private Integer patnum; + private String gestno; + 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 9ffb981..56857a0 100644 --- a/src/main/java/com/jiashi/service/UpdateService.java +++ b/src/main/java/com/jiashi/service/UpdateService.java @@ -34,8 +34,8 @@ public class UpdateService { public void upload() { String uniUrl = "http://192.168.8.74"; List cardInfos = null; - ExecutorService executor2 = Executors.newFixedThreadPool(2); - ExecutorService executor = Executors.newFixedThreadPool(12); + ExecutorService executor2 = Executors.newFixedThreadPool(3); + ExecutorService executor = Executors.newFixedThreadPool(30); do { try{ cardInfos = this.updateData(); @@ -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.getOutdeptname(),cardInfo.getPatciticard(),cardInfo.getOutwardname(),cardInfo.getIndeptname(),cardInfo.getIndeptcode(),cardInfo.getGestno()); uploadInfos.add(uploadInfo); } diff --git a/src/main/java/com/jiashi/service/UploadInfo.java b/src/main/java/com/jiashi/service/UploadInfo.java index 39aff0a..5fe5ee4 100644 --- a/src/main/java/com/jiashi/service/UploadInfo.java +++ b/src/main/java/com/jiashi/service/UploadInfo.java @@ -45,9 +45,11 @@ public class UploadInfo { private String wardPalce; + private String admissId; + 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 disDeptName,String idCard,String wardPalce,String admissDeptName,String admissDept,String admissId) { this.inpatientNo = inpatientNo; this.disDate = disDate; this.fileTitle = fileTitle; @@ -67,6 +69,7 @@ public class UploadInfo { this.wardPalce = wardPalce; this.admissDeptName = admissDeptName; this.admissDept = admissDept; + this.admissId = admissId; this.ssAssortId(); } diff --git a/src/test/java/com/jiashi/FileUploader.java b/src/test/java/com/jiashi/FileUploader.java index 9fa9299..7463ee0 100644 --- a/src/test/java/com/jiashi/FileUploader.java +++ b/src/test/java/com/jiashi/FileUploader.java @@ -59,7 +59,7 @@ public class FileUploader { "]")); // 上传URL - String uploadUrl = "http://192.168.16.116:8711/api/downplatform/fileUploadJpg"; + String uploadUrl = "http://192.168.16.116:9511/sync/fileUploadJpg"; // 执行批量上传 uploadFilesWithParams(files, uploadUrl, params);