Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit c10952f5 authored by xiachenqi's avatar xiachenqi
Browse files
Options

港澳台支持v0.9

parent 43cb7d59
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 22 deletions
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ c10952f5
......@@ -5,10 +5,8 @@ import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.utils.ExportExcel;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -16,26 +14,24 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.yxproject.start.utils.YXStringUtils.*;
@RestController
@RequestMapping("exportExcel")
public class ExportExcelApi {
@Autowired
private DetailReceiptListService detailReceiptListService;
@Autowired
private ReceiptService receiptService;
private final DetailReceiptListService detailReceiptListService;
private final ReceiptService receiptService;
Logger logger = Logger.getLogger(ExportExcelApi.class);
public ExportExcelApi(DetailReceiptListService detailReceiptListService, ReceiptService receiptService) {
this.detailReceiptListService = detailReceiptListService;
this.receiptService = receiptService;
}
/**
* 导出公安网数据
*/
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ c10952f5
......@@ -66,7 +66,7 @@ public class ReadExcelApi {
@Transactional(rollbackFor = Exception.class)
public Map<String, String> ReadPersonPost(@RequestParam("formStartTime") String startDate,
@RequestParam("formDeadLine") String endDate,
@RequestParam(value = "isGAT", required = false, defaultValue = "false") Boolean isGAT,
@RequestParam(value = "isGAT", required = false, defaultValue = "false") String isGAT,
HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
......@@ -143,7 +143,7 @@ public class ReadExcelApi {
if (list2 == null || i == 0) {
continue;
}
if (isGAT) {
if (isGAT.equals("true") || isGAT.equals("TRUE")) {
personPostEntity.setWaybillNumber((String) list2.get(17));
// personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOrderNumber((String) list2.get(0));
......@@ -153,19 +153,18 @@ public class ReadExcelApi {
// personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(4));
personPostEntity.setApplicantName((String) list2.get(47));
if ("".equals(replaceDate((String)list2.get(9)))){
birthStr=birthStr+list2.get(2).toString()+"、";
if ("".equals(replaceDate((String)list2.get(48)))){
birthStr=birthStr+list2.get(0).toString()+"、";
birthDate++;
}
personPostEntity.setBirthDate(replaceDate((String)list2.get(48)));
personPostEntity.setSenderName((String) list2.get(18));
personPostEntity.setSenderPhone((String) list2.get(19));
//todo 地址格式
personPostEntity.setSenderAddress((String) list2.get(23));
personPostEntity.setRecipientName((String) list2.get(24));
personPostEntity.setRecipientPhone((String) list2.get(25));
//todo 地址格式
personPostEntity.setRecipientAddress((String)list2.get(29));
personPostEntity.setRecipientAddress((String) list2.get(26) + list2.get(27)
+ list2.get(28) + list2.get(29));
// personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(26));
personPostEntity.setGetToCity((String) list2.get(27));
......@@ -177,9 +176,9 @@ public class ReadExcelApi {
// personPostEntity.setNatureOfTheInternal((String) list2.get(22));
//内件信息
// personPostEntity.setNatureOfTheInformation((String) list2.get(23));
personPostEntity.setFirstWhite(list2.get(46).toString().substring(5, 27));
personPostEntity.setFirstWhite((String) list2.get(46));
personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(gkMap);
// personPostEntity.setGk(gkMap);
} else {
personPostEntity.setWaybillNumber((String) list2.get(0));
personPostEntity.setBackWaybillNumber((String) list2.get(1));
......@@ -219,7 +218,7 @@ public class ReadExcelApi {
personPostService.savePersonPost(entityList);
//查询导入新格口文件邮件号是否使用过
post = personPostService.findWaybillNumber(fileNameDicEntity.getFileId()+"");
if (!isGAT) backPost = personPostService.findBackWaybillNumber(fileNameDicEntity.getFileId()+"");
if (!isGAT.equals("TRUE") && !isGAT.equals("true")) backPost = personPostService.findBackWaybillNumber(fileNameDicEntity.getFileId()+"");
} catch (Exception e) {
e.printStackTrace();
logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate);
......
src/main/java/com/yxproject/start/entity/FileNameDicEntity.java
View file @ c10952f5
package com.yxproject.start.entity;
import lombok.ToString;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
......@@ -9,6 +11,7 @@ import java.util.Objects;
* @auther zhangyusheng
* 2019/3/1 10:39
*/
@ToString
@Entity
@Table(name = "FILE_NAME_DIC", schema = "YINGXIN", catalog = "")
public class FileNameDicEntity {
......
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