Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 513d0686 authored by dahai's avatar dahai
Browse files
Options

更新交接单 交接单详单实体

parent b0320bbe
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 177 deletions
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 513d0686
......@@ -75,87 +75,89 @@ public class ReadExcelApi {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
Iterator<String> iter = multiRequest.getFileNames();
while (iter.hasNext()) {
MultipartFile item = multiRequest.getFile(iter.next());
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getName();
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getOriginalFilename();
System.out.println(item.getName()); // 为上传的key值
System.out.println(item.getOriginalFilename()); // 上传的真实文件的文件名
File file = null;
try {
file = File.createTempFile("prefix", "_" + item.getOriginalFilename());
item.transferTo(file);
} catch (IOException e) {
e.printStackTrace();
}
ReadExcel readExcel = new ReadExcel();
List list1 = readExcel.readExcel(file);
//保存EXCEL文件信息
FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
fileNameDicEntity.setFileName(filename);
fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date()));
fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicEntity.setFormDeadline(replaceDate(endDate));
fileNameDicEntity.setState((long)0);
fileNameDicService.saveFileNameDic(fileNameDicEntity);
//保存个人邮寄信息
List<PersonPostEntity> entityList = new ArrayList<>();
for (int i = 0; i < list1.size(); i++) {
PersonPostEntity personPostEntity = new PersonPostEntity();
List list2 = (List) list1.get(i);
//跳过空行和第一行
if (list2 == null || i == 0) {
continue;
}
personPostEntity.setWaybillNumber((String) list2.get(0));
personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOrderNumber((String) list2.get(2));
personPostEntity.setCreateDate((String) list2.get(3));
personPostEntity.setOpenid((String) list2.get(4));
personPostEntity.setWcPlayOrderNumber((String) list2.get(5));
personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setApplicantName((String) list2.get(8));
personPostEntity.setSenderName((String) list2.get(9));
personPostEntity.setSenderPhone((String) list2.get(10));
personPostEntity.setSenderAddress((String) list2.get(11));
personPostEntity.setRecipientName((String) list2.get(12));
personPostEntity.setRecipientPhone((String) list2.get(13));
personPostEntity.setRecipientAddress((String) list2.get(14));
personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(15));
personPostEntity.setGetToCity((String) list2.get(16));
personPostEntity.setGetToCounty((String) list2.get(17));
personPostEntity.setBusinessType((String) list2.get(18));
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,24) );
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
personPostService.savePersonPost(entityList);
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue;
} finally {
}
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
} finally {
return true;
}
List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
for (MultipartFile item :fileRows){
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getName();
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getOriginalFilename();
System.out.println(item.getName()); // 为上传的key值
System.out.println(item.getOriginalFilename()); // 上传的真实文件的文件名
File file = null;
try {
file = File.createTempFile("prefix", "_" + item.getOriginalFilename());
item.transferTo(file);
} catch (IOException e) {
e.printStackTrace();
}
ReadExcel readExcel = new ReadExcel();
List list1 = readExcel.readExcel(file);
//保存EXCEL文件信息
FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
fileNameDicEntity.setFileName(filename);
fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date()));
fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicEntity.setFormDeadline(replaceDate(endDate));
fileNameDicEntity.setState((long)0);
fileNameDicService.saveFileNameDic(fileNameDicEntity);
//保存个人邮寄信息
List<PersonPostEntity> entityList = new ArrayList<>();
for (int i = 0; i < list1.size(); i++) {
PersonPostEntity personPostEntity = new PersonPostEntity();
List list2 = (List) list1.get(i);
//跳过空行和第一行
if (list2 == null || i == 0) {
continue;
}
personPostEntity.setWaybillNumber((String) list2.get(0));
personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOrderNumber((String) list2.get(2));
personPostEntity.setCreateDate((String) list2.get(3));
personPostEntity.setOpenid((String) list2.get(4));
personPostEntity.setWcPlayOrderNumber((String) list2.get(5));
personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setApplicantName((String) list2.get(8));
personPostEntity.setSenderName((String) list2.get(9));
personPostEntity.setSenderPhone((String) list2.get(10));
personPostEntity.setSenderAddress((String) list2.get(11));
personPostEntity.setRecipientName((String) list2.get(12));
personPostEntity.setRecipientPhone((String) list2.get(13));
personPostEntity.setRecipientAddress((String) list2.get(14));
personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(15));
personPostEntity.setGetToCity((String) list2.get(16));
personPostEntity.setGetToCounty((String) list2.get(17));
personPostEntity.setBusinessType((String) list2.get(18));
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,24) );
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
personPostService.savePersonPost(entityList);
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue;
} finally {
}
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
} finally {
return true;
}
}
}
}
}catch (Exception e){
......
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 513d0686
......@@ -29,10 +29,7 @@ import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
@RequestMapping("importXML")
......@@ -77,39 +74,44 @@ public class ReadXmlApi {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
Iterator<String> iter = multiRequest.getFileNames();
while (iter.hasNext()) {
MultipartFile item = multiRequest.getFile(iter.next());
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getName();
if (filename == null || filename.trim().equals("")) {
List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
for (MultipartFile item: fileRows) {
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getName();
System.out.println(filename+"===============");
if (filename == null || filename.trim().equals("")) {
continue;
}
InputStream in = item.getInputStream();
String str = YXStringUtils.inputStream2String(in, "utf-8");
in.close();
IDCardFactory idCardFactory = new IDCardFactory();
idcardsFactory(idCardFactory.extractIDCard(str));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
continue;
} catch (IOException e) {
e.printStackTrace();
yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
continue;
} catch (DocumentException e) {
e.printStackTrace();
yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage());
continue;
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue;
}
InputStream in = item.getInputStream();
String str = YXStringUtils.inputStream2String(in, "utf-8");
in.close();
IDCardFactory idCardFactory = new IDCardFactory();
idcardsFactory(idCardFactory.extractIDCard(str));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
continue;
} catch (IOException e) {
e.printStackTrace();
yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
continue;
} catch (DocumentException e) {
e.printStackTrace();
yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage());
continue;
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue;
}
}
}
}
// item
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage());
......
src/main/java/com/yxproject/start/entity/DetailReceiptListEntity.java
View file @ 513d0686
package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/9 14:53
* 2019/3/10 14:52
*/
@Entity
@Table(name = "DETAIL_RECEIPT_LIST", schema = "YINGXIN", catalog = "")
......@@ -17,8 +16,6 @@ public class DetailReceiptListEntity {
private String name;
private String policeCode;
private String cardId;
private Time printUninstallMark;
private Time eQualityMark;
private String note;
private String signGovt;
......@@ -82,26 +79,6 @@ public class DetailReceiptListEntity {
this.cardId = cardId;
}
@Basic
@Column(name = "PRINT_UNINSTALL_MARK")
public Time getPrintUninstallMark() {
return printUninstallMark;
}
public void setPrintUninstallMark(Time printUninstallMark) {
this.printUninstallMark = printUninstallMark;
}
@Basic
@Column(name = "E_QUALITY_MARK")
public Time geteQualityMark() {
return eQualityMark;
}
public void seteQualityMark(Time eQualityMark) {
this.eQualityMark = eQualityMark;
}
@Basic
@Column(name = "NOTE")
public String getNote() {
......@@ -133,14 +110,12 @@ public class DetailReceiptListEntity {
Objects.equals(name, that.name) &&
Objects.equals(policeCode, that.policeCode) &&
Objects.equals(cardId, that.cardId) &&
Objects.equals(printUninstallMark, that.printUninstallMark) &&
Objects.equals(eQualityMark, that.eQualityMark) &&
Objects.equals(note, that.note) &&
Objects.equals(signGovt, that.signGovt);
}
@Override
public int hashCode() {
return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, printUninstallMark, eQualityMark, note, signGovt);
return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, note, signGovt);
}
}
src/main/java/com/yxproject/start/entity/ReceiptListEntity.java
View file @ 513d0686
......@@ -4,17 +4,21 @@ import javax.persistence.*;
import java.sql.Time;
import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/10 14:52
*/
@Entity
@Table(name = "RECEIPT_LIST", schema = "YINGXIN", catalog = "")
public class ReceiptListEntity {
private long id;
private Long taskId;
private Time saveDate;
private String qrCode;
private Time receiptDate;
private String policeCode;
private Long finishCount;
private Long inStorageCount;
private Long outStorageCount;
private String note;
private Time checkDate;
private String checkName;
private Long state;
@Id
@Column(name = "ID")
......@@ -27,23 +31,23 @@ public class ReceiptListEntity {
}
@Basic
@Column(name = "TASK_ID")
public Long getTaskId() {
return taskId;
@Column(name = "QR_CODE")
public String getQrCode() {
return qrCode;
}
public void setTaskId(Long taskId) {
this.taskId = taskId;
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
@Basic
@Column(name = "SAVE_DATE")
public Time getSaveDate() {
return saveDate;
@Column(name = "RECEIPT_DATE")
public Time getReceiptDate() {
return receiptDate;
}
public void setSaveDate(Time saveDate) {
this.saveDate = saveDate;
public void setReceiptDate(Time receiptDate) {
this.receiptDate = receiptDate;
}
@Basic
......@@ -67,33 +71,33 @@ public class ReceiptListEntity {
}
@Basic
@Column(name = "IN_STORAGE_COUNT")
public Long getInStorageCount() {
return inStorageCount;
@Column(name = "CHECK_DATE")
public Time getCheckDate() {
return checkDate;
}
public void setInStorageCount(Long inStorageCount) {
this.inStorageCount = inStorageCount;
public void setCheckDate(Time checkDate) {
this.checkDate = checkDate;
}
@Basic
@Column(name = "OUT_STORAGE_COUNT")
public Long getOutStorageCount() {
return outStorageCount;
@Column(name = "CHECK_NAME")
public String getCheckName() {
return checkName;
}
public void setOutStorageCount(Long outStorageCount) {
this.outStorageCount = outStorageCount;
public void setCheckName(String checkName) {
this.checkName = checkName;
}
@Basic
@Column(name = "NOTE")
public String getNote() {
return note;
@Column(name = "STATE")
public Long getState() {
return state;
}
public void setNote(String note) {
this.note = note;
public void setState(Long state) {
this.state = state;
}
@Override
......@@ -102,17 +106,17 @@ public class ReceiptListEntity {
if (o == null || getClass() != o.getClass()) return false;
ReceiptListEntity that = (ReceiptListEntity) o;
return id == that.id &&
Objects.equals(taskId, that.taskId) &&
Objects.equals(saveDate, that.saveDate) &&
Objects.equals(qrCode, that.qrCode) &&
Objects.equals(receiptDate, that.receiptDate) &&
Objects.equals(policeCode, that.policeCode) &&
Objects.equals(finishCount, that.finishCount) &&
Objects.equals(inStorageCount, that.inStorageCount) &&
Objects.equals(outStorageCount, that.outStorageCount) &&
Objects.equals(note, that.note);
Objects.equals(checkDate, that.checkDate) &&
Objects.equals(checkName, that.checkName) &&
Objects.equals(state, that.state);
}
@Override
public int hashCode() {
return Objects.hash(id, taskId, saveDate, policeCode, finishCount, inStorageCount, outStorageCount, note);
return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment