1. 打印日志

2. 调整同时并发上传参数。
3. 调整上传内容
广州市市一联众
zhanghai 1 year ago
parent 7ad3f4f7b9
commit befeed1979

@ -62,11 +62,11 @@ public class FileUploader {
// 额外的表单字段参数
List<FormField> 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" +
"]"));

@ -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<CardInfo> all = cardInfoRepository.findAll(specification, pageable);
return all.toList();
}

@ -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");
}

@ -34,7 +34,7 @@ public class UpdateService {
public void upload() {
String uniUrl = "http://192.168.8.74";
List<CardInfo> 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);

@ -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":

@ -0,0 +1,69 @@
<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
<configuration scan="true" scanPeriod="10 seconds">
<!-- 以下配置修改自springboot -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex"
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx"
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
<!-- Simple file output -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>${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}}
</pattern>
<charset>UTF-8</charset>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>log/discovery-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>debug</level>
</filter>
<!-- Safely log to the same file from multiple JVMs. Degrades performance! -->
<prudent>true</prudent>
</appender>
<appender name="FILE_ASYNC" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>512</queueSize>
<appender-ref ref="FILE"/>
</appender>
<!-- Console output -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>${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}}
</pattern>
<charset>UTF-8</charset>
</encoder>
<!-- Only log level WARN and above -->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>debug</level>
</filter>
</appender>
<!-- For loggers in the these namespaces, log at all levels. -->
<logger name="pedestal" level="ALL"/>
<logger name="hammock-cafe" level="ALL"/>
<logger name="user" level="ALL"/>
<!--显示日志-->
<logger name="org.springframework.jdbc.core" additivity="false" level="DEBUG">
<appender-ref ref="STDOUT"/>
<appender-ref ref="FILE_ASYNC"/>
</logger>
<root level="INFO">
<appender-ref ref="FILE_ASYNC"/>
<appender-ref ref="STDOUT"/>
</root>
</configuration>
Loading…
Cancel
Save