Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit cc82eaf3 authored by liboyang's avatar liboyang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 08d9e444 c38b59cc
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 121 deletions
src/main/java/com/yxproject/start/api/AdminApi.java
View file @ cc82eaf3
......@@ -74,7 +74,6 @@ public class AdminApi {
flag = userInfoService.addUser(userInfo, Integer.parseInt(jsonObject.getString("roleId")));
if (flag) {
map.put("resultMsg", "添加成功");
} else {
map.put("resultMsg", "添加失败");
}
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ cc82eaf3
......@@ -22,8 +22,13 @@ import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import java.io.*;
import javax.xml.crypto.Data;
import java.io.File;
import java.io.IOException;
import java.sql.Time;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
/**
......@@ -46,10 +51,13 @@ public class ReadExcelApi {
@Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class)
public boolean ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) {
System.out.println("进入api");
YXJSONResponse yxresp = new YXJSONResponse();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
resp.setCharacterEncoding("UTF-8");
String filename = "";
DiskFileItemFactory factory = new DiskFileItemFactory();
// 设置缓冲区的大小为100KB，如果不指定，那么缓冲区的大小默认是10KB
factory.setSizeThreshold(1024 * 100);
ServletFileUpload upload = new ServletFileUpload(factory);
......@@ -62,8 +70,6 @@ public class ReadExcelApi {
Map<String, String> map = new HashMap<String, String>();
List<FileItem> list = null;
try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext());
......@@ -76,27 +82,27 @@ public class ReadExcelApi {
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称，
// 得到上传的文件名称
filename = item.getName();
File file = null;
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称，
// 得到上传的文件名称
filename = item.getName();
if (filename == null || filename.trim().equals("")) {
continue;
}
InputStream in = item.getInputStream();
OutputStream os = new FileOutputStream(file);
int bytesRead = 0;
byte[] buffer = new byte[8192];
while ((bytesRead = in.read(buffer, 0, 8192)) != -1) {
os.write(buffer, 0, bytesRead);
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();
}
os.close();
in.close();
// CommonsMultipartFile cf= (CommonsMultipartFile)item;
// DiskFileItem fi = (DiskFileItem)cf.getFileItem();
// File file = fi.getStoreLocation();
ReadExcel readExcel = new ReadExcel();
List list1 = readExcel.readExcel(file);
//保存EXCEL文件信息
......@@ -104,8 +110,8 @@ public class ReadExcelApi {
fileNameDicEntity.setFileName(filename);
fileNameDicEntity.setUploadDate(new Date());
//保存个人邮寄信息
long fileID = fileNameDicService.saveFileNameDic(fileNameDicEntity);
List<PersonPostEntity> entityList = new ArrayList<PersonPostEntity>();
// long fileID = 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);
......@@ -113,43 +119,35 @@ public class ReadExcelApi {
if (list2 == null || i == 0) {
continue;
}
personPostEntity.setBackWaybillNumber((String) list2.get(0));
personPostEntity.setOrderNumber((String) list2.get(1));
personPostEntity.setCreateDate((Time) list2.get(2));
personPostEntity.setOpenid((String) list2.get(3));
personPostEntity.setWcPlayOrderNumber((String) list2.get(4));
personPostEntity.setPlayState((String) list2.get(5));
personPostEntity.setOrderState((String) list2.get(6));
personPostEntity.setApplicantName((String) list2.get(7));
personPostEntity.setSenderName((String) list2.get(8));
personPostEntity.setSenderPhone((String) list2.get(9));
personPostEntity.setSenderAddress((String) list2.get(10));
personPostEntity.setRecipientName((String) list2.get(11));
personPostEntity.setRecipientPhone((String) list2.get(12));
personPostEntity.setRecipientAddress((String) list2.get(13));
personPostEntity.setOrderBlankNumber((String) list2.get(14));
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((String) list2.get(22));
personPostEntity.setFileId(fileID);
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((String) list2.get(15));
personPostEntity.setGetToProvince((String) list2.get(16));
personPostEntity.setGetToCity((String) list2.get(17));
personPostEntity.setGetToCounty((String) list2.get(18));
personPostEntity.setBusinessType((String) list2.get(19));
personPostEntity.setLatticeMouthInformation((String) list2.get(20));
personPostEntity.setNatureOfTheInternal((String) list2.get(21));
personPostEntity.setNatureOfTheInformation((String) list2.get(22));
personPostEntity.setFirstWhite((String) list2.get(23));
entityList.add(personPostEntity);
}
boolean b = personPostService.savePersonPost(entityList);
personPostService.savePersonPost(entityList);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
continue;
} catch (IOException e) {
e.printStackTrace();
yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
continue;
} catch (Exception e) {
e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ cc82eaf3
......@@ -5,6 +5,7 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.service.TaskListService;
import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -77,4 +78,68 @@ public class TaskListApi {
return true;
}
/**
* 根据上传时间查询数据(用于生成任务单)
* @param date
* @return
*/
@RequestMapping("selectByDate")
public String selectByDate(@Param("date") String date){
String result = "[\n" +
" {\n" +
" typeCode: '1',\n" +
" typeName: '普通证',\n" +
" typeSum: 300,\n" +
" isActive: 'true',\n" +
" countyList: [\n" +
" {\n" +
" taskId: '20190228001',\n" +
" county: '西城区',\n" +
" groupNo: '00234653-03687587',\n" +
" valid: 240,\n" +
" invalid: 0\n" +
" },\n" +
" {\n" +
" taskId: '20190228001',\n" +
" county: '东城区',\n" +
" groupNo: '00234653-03687587',\n" +
" valid: 240,\n" +
" invalid: 0\n" +
" },\n" +
" {\n" +
" taskId: '20190228001',\n" +
" county: '海淀区',\n" +
" groupNo: '00234653-03687587',\n" +
" valid: 240,\n" +
" invalid: 0\n" +
" }\n" +
" ]\n" +
" },\n" +
" {\n" +
" typeCode: '9',\n" +
" typeName: '邮寄证',\n" +
" typeSum: 500,\n" +
" isActive: 'false',\n" +
" countyList: [\n" +
" {\n" +
" taskId: '20190228001',\n" +
" county: '朝阳区',\n" +
" groupNo: '00234653-03687587',\n" +
" valid: 240,\n" +
" invalid: 0\n" +
" },\n" +
" {\n" +
" taskId: '20190228001',\n" +
" county: '昌平区',\n" +
" groupNo: '00234653-03687587',\n" +
" valid: 240,\n" +
" invalid: 0\n" +
" }\n" +
" ]\n" +
" }\n" +
"]";
return result;
}
}
src/main/java/com/yxproject/start/entity/PersonPostEntity.java
View file @ cc82eaf3
......@@ -5,12 +5,12 @@ import java.sql.Time;
import java.util.Objects;
@Entity
@Table(name = "PERSON_POST", schema = "YINGXIN", catalog = "")
@Table(name = "PERSON_POST", schema = "YX", catalog = "")
public class PersonPostEntity {
private String waybillNumber;
private String backWaybillNumber;
private String orderNumber;
private Time createDate;
private String createDate;
private String openid;
private String wcPlayOrderNumber;
private String playState;
......@@ -37,7 +37,12 @@ public class PersonPostEntity {
private Time validPeriodEnd;
private String note;
private Long state;
private Time uploadDate;
private Long fileId;
private Time analysisDate;
private Time printDate;
private Time formStartTime;
private Time formDeadline;
@Id
@Column(name = "WAYBILL_NUMBER")
......@@ -71,11 +76,11 @@ public class PersonPostEntity {
@Basic
@Column(name = "CREATE_DATE")
public Time getCreateDate() {
public String getCreateDate() {
return createDate;
}
public void setCreateDate(Time createDate) {
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
......@@ -339,6 +344,15 @@ public class PersonPostEntity {
this.state = state;
}
@Basic
@Column(name = "UPLOAD_DATE")
public Time getUploadDate() {
return uploadDate;
}
public void setUploadDate(Time uploadDate) {
this.uploadDate = uploadDate;
}
@Basic
@Column(name = "FILE_ID")
......@@ -350,6 +364,45 @@ public class PersonPostEntity {
this.fileId = fileId;
}
@Basic
@Column(name = "ANALYSIS_DATE")
public Time getAnalysisDate() {
return analysisDate;
}
public void setAnalysisDate(Time analysisDate) {
this.analysisDate = analysisDate;
}
@Basic
@Column(name = "PRINT_DATE")
public Time getPrintDate() {
return printDate;
}
public void setPrintDate(Time printDate) {
this.printDate = printDate;
}
@Basic
@Column(name = "FORM_START_TIME")
public Time getFormStartTime() {
return formStartTime;
}
public void setFormStartTime(Time formStartTime) {
this.formStartTime = formStartTime;
}
@Basic
@Column(name = "FORM_DEADLINE")
public Time getFormDeadline() {
return formDeadline;
}
public void setFormDeadline(Time formDeadline) {
this.formDeadline = formDeadline;
}
@Override
public boolean equals(Object o) {
......@@ -386,11 +439,16 @@ public class PersonPostEntity {
Objects.equals(validPeriodEnd, that.validPeriodEnd) &&
Objects.equals(note, that.note) &&
Objects.equals(state, that.state) &&
Objects.equals(fileId, that.fileId) ;
Objects.equals(uploadDate, that.uploadDate) &&
Objects.equals(fileId, that.fileId) &&
Objects.equals(analysisDate, that.analysisDate) &&
Objects.equals(printDate, that.printDate) &&
Objects.equals(formStartTime, that.formStartTime) &&
Objects.equals(formDeadline, that.formDeadline);
}
@Override
public int hashCode() {
return Objects.hash(waybillNumber, backWaybillNumber, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, fileId);
return Objects.hash(waybillNumber, backWaybillNumber, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline);
}
}
src/main/java/com/yxproject/start/mapper/CrippledCardMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 废证
* @param
* @return
*/
public interface CrippledCardMapper {
}
src/main/java/com/yxproject/start/mapper/ExitCardMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 退证
*/
public interface ExitCardMapper {
}
src/main/java/com/yxproject/start/mapper/FastCardMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 快证
*/
public interface FastCardMapper {
}
src/main/java/com/yxproject/start/mapper/HandoverSheetMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 交接单
*/
public interface HandoverSheetMapper {
}
src/main/java/com/yxproject/start/mapper/NeedlessCredMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 余证mapper
*/
public interface NeedlessCredMapper {
}
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ cc82eaf3
......@@ -12,7 +12,10 @@ import java.util.List;
*/
@Mapper
public interface PersonPostMapper {
@Update("insert into PERSON_POST ( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE,UPLOAD_DATE) values (#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#(uploadDate))")
@Update("insert into PERSON_POST " +
"( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE) " +
"values " +
"(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite})")
public boolean savePersonPost(PersonPostEntity personPostEntity);
@Update("update prepro_person p set IS_POST=9 where p.JMSFZSLH in ( select p.JMSFZSLH from prepro_person p left join files files on p.file_id=files.ID \n" +
......
src/main/java/com/yxproject/start/mapper/QueryCardMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 查询证件信息
*/
public interface QueryCardMapper {
}
src/main/java/com/yxproject/start/mapper/SaveCardDetailListMapper.java deleted 100644 → 0
View file @ 08d9e444
package com.yxproject.start.mapper;
/**
* 身份证详单
*/
public interface SaveCardDetailListMapper {
}
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ cc82eaf3
......@@ -91,5 +91,11 @@ public interface TaskListMapper {
public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
/**
* 生成快证任务单
*/
@Update("")
public boolean createFastCard (@Param("acceptNo")String accept);
}
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ cc82eaf3
......@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.xml.crypto.Data;
import java.sql.Time;
import java.util.Date;
import java.util.List;
......@@ -27,8 +29,7 @@ public class PersonPostServiceImpl implements PersonPostService {
@Transactional(rollbackFor = Exception.class)
public boolean savePersonPost(List<PersonPostEntity> personPostEntities) {
for (PersonPostEntity personPostEntity: personPostEntities) {
personPostEntity.setCreateDate(new java.sql.Time(new Date().getTime()));
boolean b = personPostMapper.savePersonPost(personPostEntity);
personPostMapper.savePersonPost(personPostEntity);
}
return true;
}
......
src/main/java/com/yxproject/start/utils/ReadExcel.java
View file @ cc82eaf3
......@@ -4,7 +4,9 @@ import jxl.Sheet;
import jxl.Workbook;
import jxl.read.biff.BiffException;
import java.io.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
......@@ -16,10 +18,10 @@ public class ReadExcel {
// 去读Excel的方法readExcel，该方法的入口参数为一个File对象
public List readExcel(File file) {
try {
// 创建输入流，读取Excel
InputStream is = new FileInputStream(file.getAbsolutePath());
// // 创建输入流，读取Excel
// InputStream is = new FileInputStream(file.getAbsolutePath());
// jxl提供的Workbook类
Workbook wb = Workbook.getWorkbook(is);
Workbook wb = Workbook.getWorkbook(file);
// Excel的页签数量
int sheet_size = wb.getNumberOfSheets();
for (int index = 0; index < sheet_size; index++) {
......
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