上传联众代码

广州市市一联众
zhanghai 1 year ago
parent 768bf819d4
commit 26d841d833

@ -4,7 +4,6 @@ import com.jiashi.MyDateUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.boot.test.autoconfigure.data.cassandra.DataCassandraTest;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -32,6 +31,8 @@ public class CardInfo {
private Date outdate;
@Column(name="indate")
private Date indate;
private String outdeptcode;
@Column(name="outdeptname")
private String outdeptname;
@Column(name="patsex")
@ -40,6 +41,29 @@ public class CardInfo {
private Date patbirthday;
private Integer state;
private String icdecode11;
private String icdename11;
@Column(name="mjwesticde")
private String mjwesticde;
@Column(name="mjwestname")
private String mjwestname;
private String patciticard;
private Integer patage;
private String indeptcode;
private String indeptname;
private String outwardname;
private Integer patnum;
public String getOutdateStr(){
return MyDateUtil.dateToString(this.outdate,"yyyy-MM-dd");

@ -4,23 +4,22 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
@Entity
@Table(name = "T_Picture")
@Data
@NoArgsConstructor
@AllArgsConstructor
@IdClass(PicturePk.class)
public class Picture {
@Id
@Column(name="picid")
private String picid;
@Id
@Column(name="picname")
private String picname;
@Id
@Column(name="fileid")
private String fileid;
@Column(name="rotatedegree")
@ -30,7 +29,7 @@ public class Picture {
private String pickind;
public String getFileUrl(){
String fileUrl = "d:/pic/" + this.getFileid() + "/" + this.getPicname();
String fileUrl = "c:/pic/" + this.getFileid() + "/" + this.getPicname();
return fileUrl;
}

@ -0,0 +1,11 @@
package com.jiashi.service;
import lombok.Data;
import java.io.Serializable;
@Data
public class PicturePk implements Serializable {
private String picname;
private String fileid;
}

@ -7,12 +7,9 @@ import com.jiashi.dao.DataQuery;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@ -38,7 +35,7 @@ public class UpdateService {
String uniUrl = "http://192.168.8.74";
List<CardInfo> cardInfos = null;
ExecutorService executor2 = Executors.newFixedThreadPool(2);
ExecutorService executor = Executors.newFixedThreadPool(5);
ExecutorService executor = Executors.newFixedThreadPool(12);
do {
try{
cardInfos = this.updateData();
@ -53,24 +50,24 @@ public class UpdateService {
dataQuery.updateBatchState(cardInfo,5);
return;
}
String dir = "c:\\pic\\"+cardInfo.getId();
// 创建File对象
File directory = new File(dir);
// 判断目录是否存在
if (!directory.exists()) {
// 目录不存在,创建目录
boolean created = directory.mkdirs();
if (created) {
log.info("目录创建成功:" + dir);
} else {
log.info("目录创建失败:" + dir);
}
}
List<Future> futures = new ArrayList<>();
for (Picture picture : pictures) {
Future future = executor.submit(() -> {
try {
String dir = "d:\\pic\\"+picture.getFileid();
// 创建File对象
File directory = new File(dir);
// 判断目录是否存在
if (!directory.exists()) {
// 目录不存在,创建目录
boolean created = directory.mkdirs();
if (created) {
log.info("目录创建成功:" + dir);
} else {
log.info("目录创建失败:" + dir);
}
}
String cmd = "C:\\Debug\\lianzhong.exe 003 192.168.8.74 " + cardInfo.getId() + " " + picture.getPicid() + " " + cardInfo.getPatno() + " " + cardInfo.getOutdateStr() + " " + picture.getPicname() + " " + picture.getFileUrl() + " " + uniUrl + " " + picture.getRotatedegree();
log.info(cmd);
java.lang.Process process = java.lang.Runtime.getRuntime().exec(cmd);//执行命令生成cube
@ -97,7 +94,11 @@ public class UpdateService {
List<UploadInfo> uploadInfos = new ArrayList<>();
for(Picture picture : pictures){
files.add(new File(picture.getFileUrl()));
UploadInfo uploadInfo = new UploadInfo(cardInfo.getPatno(), cardInfo.getOutdateStr2(), picture.getPicname(), picture.getPicname(), picture.getPickind(), cardInfo.getId(), cardInfo.getPatname(), cardInfo.getIndateStr(), cardInfo.getPatsex());
UploadInfo uploadInfo = new UploadInfo(cardInfo.getPatno(), cardInfo.getOutdateStr2(), picture.getPicname(), picture.getPicname(),
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());
uploadInfos.add(uploadInfo);
}
@ -108,20 +109,21 @@ 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);
}
// 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);
// 删除文件
// String dir = "d:\\pic\\"+cardInfo.getId();
// File file = new File(dir);

@ -25,7 +25,29 @@ public class UploadInfo {
private String admissDate;
private String sex;
public UploadInfo(String inpatientNo, String disDate, String fileTitle, String uploadFileName, String assortId, String patientId, String name, String admissDate, String sex) {
private Integer admissTimes;
private String mainDiagCode;
private String mainDiagName;
private String mainOperateCode;
private String mainOperateName;
private String admissDept;
private String admissDeptName;
private String disDeptName;
private String idCard;
private String wardPalce;
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) {
this.inpatientNo = inpatientNo;
this.disDate = disDate;
this.fileTitle = fileTitle;
@ -35,6 +57,16 @@ public class UploadInfo {
this.name = name;
this.admissDate = admissDate;
this.sex = sex;
this.admissTimes = admissTimes;
this.mainOperateName = mainOperateName;
this.mainDiagCode = mainDiagCode;
this.mainDiagName = mainDiagName;
this.mainOperateCode = mainOperateCode;
this.disDeptName = disDeptName;
this.idCard = idCard;
this.wardPalce = wardPalce;
this.admissDeptName = admissDeptName;
this.admissDept = admissDept;
this.ssAssortId();
}
@ -42,106 +74,106 @@ public class UploadInfo {
public void ssAssortId() {
switch (assortId) {
case "1":
this.assortId = "2111";
this.assortId = "1";
break;
case "2":
this.assortId = "2112";
this.assortId = "2";
break;
case "3":
this.assortId = "2113";
this.assortId = "3";
break;
case "4":
this.assortId = "2114";
this.assortId = "4";
break;
case "5":
this.assortId = "2115";
this.assortId = "5";
break;
case "6":
this.assortId = "2116";
this.assortId = "6";
break;
case "7":
this.assortId = "2117";
this.assortId = "7";
break;
case "8":
this.assortId = "2118";
this.assortId = "8";
break;
case "9":
this.assortId = "2119";
this.assortId = "9";
break;
case "10":
this.assortId = "21110";
this.assortId = "10";
break;
case "11":
this.assortId = "21111";
this.assortId = "11";
break;
case "12":
this.assortId = "21112";
this.assortId = "12";
break;
case "13":
this.assortId = "21113";
this.assortId = "13";
break;
case "14":
this.assortId = "21114";
this.assortId = "14";
break;
case "15":
this.assortId = "21115";
this.assortId = "15";
break;
case "16":
this.assortId = "21116";
this.assortId = "16";
break;
case "17":
this.assortId = "21117";
this.assortId = "17";
break;
case "18":
this.assortId = "21118";
this.assortId = "18";
break;
case "19":
this.assortId = "21119";
this.assortId = "19";
break;
case "20":
this.assortId = "21120";
this.assortId = "20";
break;
case "21":
this.assortId = "21121";
this.assortId = "21";
break;
case "22":
this.assortId = "21122";
this.assortId = "22";
break;
case "23":
this.assortId = "21123";
this.assortId = "23";
break;
case "24":
this.assortId = "21124";
this.assortId = "24";
break;
case "25":
this.assortId = "21125";
this.assortId = "25";
break;
case "26":
this.assortId = "21126";
this.assortId = "26";
break;
case "27":
this.assortId = "21127";
this.assortId = "27";
break;
case "28":
this.assortId = "21128";
this.assortId = "28";
break;
case "29":
this.assortId = "21129";
this.assortId = "29";
break;
case "30":
this.assortId = "21130";
this.assortId = "30";
break;
case "31":
this.assortId = "21131";
this.assortId = "31";
break;
case "32":
this.assortId = "21132";
this.assortId = "32";
break;
case "33":
this.assortId = "21133";
this.assortId = "33";
break;
default:
this.assortId = "21133";
this.assortId = "33";
}

Loading…
Cancel
Save