Skip to content

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

0907

parent f3530af7
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 75 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ a311b2cd
......@@ -57,60 +57,63 @@ public class ExportXMLApi {
@RequestMapping("printXmlData")
public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard") String IDCard, @RequestParam("oldFile") String oldFile, @RequestParam("newFile") String newFile, @RequestParam("SSXQDM") String SSXQDM, @RequestParam("cardType") String cardType, @RequestParam("state") String state, @RequestParam("uploadDate1") String uploadDate1, @RequestParam("uploadDate2") String uploadDate2, @RequestParam("downloadState") String downloadState, HttpServletResponse response) {
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件
List<PreproPersonDto> preProPersonDtoList;
logger.info(new Date() + "开始查询");
preProPersonDtoList = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate1), replaceDate(uploadDate2), downloadState);
List<PreproPersonDto> preProPersonEntities = new ArrayList<>(preProPersonDtoList);
List<PreproPersonDto> preProPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate1), replaceDate(uploadDate2), downloadState);
logger.info(new Date() + "结束查询");
if (!preProPersonEntities.isEmpty()) {
//将制证详情详细划分
Map<Long, Object> map = new LinkedHashMap<>();
Map<Long, Object> cardTypeProPersonListMap = new LinkedHashMap<>(); // key是证件类型 value是这种证件的List
for (PreproPersonDto preproPersonDto : preProPersonEntities) {
if (map.containsKey(preproPersonDto.getCardTypeId())) {
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) map.get(preproPersonDto.getCardTypeId());
if (cardTypeProPersonListMap.containsKey(preproPersonDto.getCardTypeId())) {
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) cardTypeProPersonListMap.get(preproPersonDto.getCardTypeId());
preproPersonEntityList.add(preproPersonDto);
map.put(preproPersonDto.getCardTypeId(), preproPersonEntityList);
cardTypeProPersonListMap.put(preproPersonDto.getCardTypeId(), preproPersonEntityList);
} else {
List<PreproPersonDto> preproPersonEntityList = new ArrayList<>();
preproPersonEntityList.add(preproPersonDto);
map.put(preproPersonDto.getCardTypeId(), preproPersonEntityList);
cardTypeProPersonListMap.put(preproPersonDto.getCardTypeId(), preproPersonEntityList);
}
}
List<List<Map<String, Object>>> lists = new ArrayList<>();
for (Long cardTypeId : map.keySet()) {
List<List<Map<String, Object>>> cardTypeDwdmEntityLists = new ArrayList<>(); // 所有制证类型-所有制证类型下单位名称划分的entityList的map的list-所有制证类型下单位名称划分的entityList的map
for (Long cardTypeId : cardTypeProPersonListMap.keySet()) { // 开始按证件类型遍历
//区分邮寄证和大批证件类型
//大批证
if (cardTypeId == 0 || cardTypeId == 10 || cardTypeId == 5 || cardTypeId == 7 ) {
List list = new ArrayList();
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) map.get(cardTypeId);
Map<String, Object> mapFileId = new LinkedHashMap<>();
List dwdmProPersonLists = new ArrayList();
// 得到某一种证件类型的entityList
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) cardTypeProPersonListMap.get(cardTypeId);
Map<String, Object> dwdmProPersonListMap = new LinkedHashMap<>(); // 这个制证类型下根据单位代码划分的entityList
for (PreproPersonDto preproPersonEntity : preproPersonEntityList) {
if (mapFileId.containsKey(preproPersonEntity.getDwdm())) {
List<PreproPersonDto> preproPersonEntityListFileId = (List<PreproPersonDto>) mapFileId.get(preproPersonEntity.getDwdm());
preproPersonEntityListFileId.add(preproPersonEntity);
mapFileId.put(preproPersonEntity.getDwdm(), preproPersonEntityListFileId);
String dwdm = preproPersonEntity.getDwdm();
if (dwdmProPersonListMap.containsKey(dwdm)) {
// 某个制证类型下属于某个单位代码的entityList
List<PreproPersonDto> proPersonEntityList = (List<PreproPersonDto>) dwdmProPersonListMap.get(dwdm);
// 所有符合单位代码的都加入这个entityList
proPersonEntityList.add(preproPersonEntity);
// 把单位代码和entityList写在map里
dwdmProPersonListMap.put(dwdm, proPersonEntityList);
} else {
List<PreproPersonDto> preproPersonEntityListFileId = new ArrayList<>();
preproPersonEntityListFileId.add(preproPersonEntity);
mapFileId.put(preproPersonEntity.getDwdm(), preproPersonEntityListFileId);
List<PreproPersonDto> proPersonEntityList = new ArrayList<>();
proPersonEntityList.add(preproPersonEntity);
dwdmProPersonListMap.put(preproPersonEntity.getDwdm(), proPersonEntityList);
}
}
list.add(mapFileId);
lists.add(list);
dwdmProPersonLists.add(dwdmProPersonListMap); // （这个层级似乎是多余的）把某种制证类型下 所有按单位代码划分的entityList集合的map写入一个list（这个list中只有一个元素）
cardTypeDwdmEntityLists.add(dwdmProPersonLists);
} else {
//邮寄证
List list = new ArrayList();
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) map.get(cardTypeId);
Map<String, Object> mapFileId = new LinkedHashMap<>();
mapFileId.put("1", preproPersonEntityList);
list.add(mapFileId);
lists.add(list);
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) cardTypeProPersonListMap.get(cardTypeId);
Map<String, Object> dwdmProPersonListMap = new LinkedHashMap<>();
dwdmProPersonListMap.put("1", preproPersonEntityList); // 因为是邮寄证，所以瞎写了一个dwdm
list.add(dwdmProPersonListMap); // 像普通证一样放入这个多余的list中
cardTypeDwdmEntityLists.add(list);
}
}
List<String> documentList = new ArrayList<>();
//执行生成XML文件方法
logger.info(new Date() + "开始生成xml");
for (List<Map<String, Object>> mapList : lists) {
for (List<Map<String, Object>> mapList : cardTypeDwdmEntityLists) {
for (Map<String, Object> objectMap : mapList) {
for (String fileId : objectMap.keySet()) {
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) objectMap.get(fileId);
......
src/main/java/com/yxproject/start/api/LogApi.java
View file @ a311b2cd
......@@ -228,7 +228,7 @@ public class LogApi {
logger.info("开始查询XML、Excel、身份数据信息----->"+sdf.format(new Date()));
//更新xml数据中的证件类型和格口文件解析状态
logService.changeCardTypeByPrintDate(getCurrentDate2String("yyyyMMddhhmmss"),printDate);
//查询XML文件信息
//查询XML文件信息 select SOURCE_FILE_NAME,id,RECORD_NUMBER from files
List <Map <String, Object>> resultList = logService.selectFileIdByUploadDate(printDate);
//查询身份数据
List <Map <String, Object>> personList = logService.selectPersonPostUnanalysis(printDate);
......@@ -251,8 +251,8 @@ public class LogApi {
for (Map<String, Object> personData : personList) {
logService.insertIdData((String) personData.get("GMSFHM"), (String) personData.get("SSXQDM"), (String) personData.get("YXQQSRQ"), (String) personData.get("YXQJZRQ"), (String) personData.get("JMSFZSLH"));
Map<String, Object> map = new HashMap<>();
map.put("gkId", personData.get("GK_ID"));
map.put("xmlId", personData.get("XML_ID"));
map.put("gkId", personData.get("GK_ID")); //实际上是file_id
map.put("xmlId", personData.get("XML_ID")); //实际上是xml_id
//将每个xml的不同格口保存
if (!analysusList.contains(map)) {
analysusList.add(map);
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ a311b2cd
......@@ -152,19 +152,19 @@ public class ReadExcelApi {
personPostEntity.setWcPlayOrderNumber("");
personPostEntity.setPlayState("");
personPostEntity.setOrderState((String) list2.get(4));
personPostEntity.setApplicantName((String) list2.get(47));
if ("".equals(replaceDate((String)list2.get(48)))){
personPostEntity.setApplicantName((String) list2.get(48));
if ("".equals(replaceDate((String)list2.get(49)))){
birthStr=birthStr+list2.get(0).toString()+"、";
birthDate++;
}
personPostEntity.setBirthDate(replaceDate((String)list2.get(48)));
personPostEntity.setBirthDate(replaceDate((String)list2.get(49)));
personPostEntity.setSenderName((String) list2.get(18));
personPostEntity.setSenderPhone((String) list2.get(19));
personPostEntity.setSenderAddress((String) list2.get(23));
personPostEntity.setRecipientName((String) list2.get(24));
personPostEntity.setRecipientPhone((String) list2.get(25));
personPostEntity.setRecipientAddress((String) list2.get(26) + list2.get(27)
+ list2.get(28) + list2.get(29));
personPostEntity.setRecipientAddress((String) list2.get(27) + list2.get(28)
+ list2.get(29));
personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(26));
personPostEntity.setGetToCity((String) list2.get(27));
......@@ -176,7 +176,7 @@ public class ReadExcelApi {
personPostEntity.setNatureOfTheInternal("");
//内件信息
personPostEntity.setNatureOfTheInformation("");
personPostEntity.setFirstWhite((String) list2.get(46));
personPostEntity.setFirstWhite((String) list2.get(47));
personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(0L);
} else {
......@@ -189,8 +189,8 @@ public class ReadExcelApi {
personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setApplicantName((String) list2.get(8));
if ("".equals(replaceDate((String)list2.get(9)))){
birthStr=birthStr+list2.get(2).toString()+"、";
if (replaceDate((String) list2.get(9)).isEmpty()){
birthStr=birthStr + list2.get(2).toString()+"、";
birthDate++;
}
personPostEntity.setBirthDate(replaceDate((String)list2.get(9)));
......
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ a311b2cd
......@@ -3,7 +3,6 @@ package com.yxproject.start.api;
import com.yxproject.start.dto.PreproPersonDto;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.service.ImportXmlService;
import com.yxproject.start.utils.IDCardFactory;
import com.yxproject.start.utils.YXJSONResponse;
......@@ -14,7 +13,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.dom4j.DocumentException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -168,11 +166,14 @@ public class ReadXmlApi {
* 查询XML解析信息
*
* @param importDate 上传时间
* @param resp
* @return
*/
//todo 本地受理数量查询/港澳台数量查询
@RequestMapping("queryPersonXML")
public String queryPersonXMLCount(@RequestParam("importDate") String importDate, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, HttpServletResponse resp, HttpServletRequest requ) {
public String queryPersonXMLCount(@RequestParam("importDate") String importDate,
@RequestParam("currPage") String currPage,
@RequestParam("pageSize") String pageSize,
HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
......
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ a311b2cd
......@@ -70,7 +70,9 @@ public class ImportXmlServiceImpl implements ImportXmlService {
ZWE_ZWTXSJ.setText(preproPersonDto.getZweZwtxsj());
Element ZWE_ZWTZSJ = PACKAGE.addElement("ZWE_ZWTZSJ");
ZWE_ZWTZSJ.setText(preproPersonDto.getZweZwtzsj());
String url = "D:\\TP_PATH_YD\\"+ uploadDate + "\\" + "ZAGL_YDZZ_" + filesEntity.getSourceFileName() + preproPersonDto.getNo() + ".xml";
boolean isGAT = personIsHk(filesEntity.getSourceFileName()) || personIsTw(filesEntity.getSourceFileName());
String url = isGAT ? "C:\\TP_PATH_YD\\"+ uploadDate + "\\" + "ZAGL_GATZZ_" + filesEntity.getSourceFileName() + preproPersonDto.getNo() + ".xml"
: "C:\\TP_PATH_YD\\"+ uploadDate + "\\" + "ZAGL_YDZZ_" + filesEntity.getSourceFileName() + preproPersonDto.getNo() + ".xml";
try {
File file = new File(url);
if(!file.exists()){
......@@ -96,10 +98,10 @@ public class ImportXmlServiceImpl implements ImportXmlService {
if (personIsYdss(preproPersonDto.getJmsfzslh())) {
preproPersonDto.setCardTypeId(10L);
}
if (personIsHk(preproPersonDto.getJmsfzslh())) {
if (personIsHk(filesEntity.getSourceFileName())) {
preproPersonDto.setCardTypeId(5L);
}
if (personIsTw(preproPersonDto.getJmsfzslh())) {
if (personIsTw(filesEntity.getSourceFileName())) {
preproPersonDto.setCardTypeId(7L);
}
boolean b = preproPersonMapper.savePreproPersonEntity(preproPersonDto);
......@@ -138,20 +140,20 @@ public class ImportXmlServiceImpl implements ImportXmlService {
}
/**
* 从受理号判断是否为港澳证 受理号倒数第5位为6
* @param jmsfzslh 受理号
* 从原始包号判断是否为港澳证 包号倒数第5位为6
* @param sjbbh 包号
* @return true 是异地首申
*/
protected boolean personIsHk(String jmsfzslh) {
return jmsfzslh.charAt(jmsfzslh.length() - 5) == '6';
protected boolean personIsHk(String sjbbh) {
return sjbbh.charAt(sjbbh.length() - 5) == '6';
}
/**
* 从受理号判断是否为台湾证 受理号倒数第5位为7
* @param jmsfzslh 受理号
* 从包号判断是否为台湾证 包号倒数第5位为7
* @param sjbbh 数据包包号
* @return true 是异地首申
*/
protected boolean personIsTw(String jmsfzslh) {
return jmsfzslh.charAt(jmsfzslh.length() - 5) == '7';
protected boolean personIsTw(String sjbbh) {
return sjbbh.charAt(sjbbh.length() - 5) == '7';
}
}
src/main/java/com/yxproject/start/utils/IDCardFactory.java
View file @ a311b2cd
......@@ -132,6 +132,7 @@ public class IDCardFactory {
preproPersonEntity.setXm(e.element("XM").getStringValue());
preproPersonEntity.setXbdm(e.element("XBDM").getStringValue());
// preproPersonEntity.setMzdm(e.element("MZDM").getStringValue()); 港澳台没有民族代码
preproPersonEntity.setMzdm("");
preproPersonEntity.setCsrq(e.element("CSRQ").getStringValue());
preproPersonEntity.setSsxqdm(e.element("SSXQDM").getStringValue());
preproPersonEntity.setDzmc(e.element("DZMC").getStringValue());
......@@ -143,37 +144,22 @@ public class IDCardFactory {
preproPersonEntity.setQfjgGajgmc(e.element("QFJG_GAJGMC").getStringValue());
preproPersonEntity.setYxqqsrq(e.element("GATJMJZZYXQQSRQ").getStringValue()); // 港澳台居民居住证有效期起始日期
preproPersonEntity.setYxqjzrq(e.element("GATJMJZZYXQJZRQ").getStringValue()); // 港澳台居民居住证有效期截止日期
preproPersonEntity.setJmsfzslyydm(e.element("JMSFZSLYYDM").getStringValue());
preproPersonEntity.setJmsfzzzlxdm(e.element("JMSFZZZLXDM").getStringValue());
preproPersonEntity.setJmsfzlzfsdm(e.element("JMSFZLZFSDM").getStringValue());
preproPersonEntity.setJmsfzslyydm(e.element("GATJMJZZSLYYDM").getStringValue()); // 申领原因
preproPersonEntity.setJmsfzzzlxdm(e.element("GATJMJZZZZLXDM").getStringValue()); // 执政类型
preproPersonEntity.setJmsfzlzfsdm(e.element("GATJMJZZLZFSDM").getStringValue()); // 领证方式代码
preproPersonEntity.setSjrXm(e.element("SJR_XM").getStringValue());
preproPersonEntity.setSjrLxdh(e.element("SJR_LXDH").getStringValue());
preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue());
preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue());
//民族文字 sid=010210
if(preproPersonEntity.getSid().equals("010210")) {
preproPersonEntity.setXmmzwz(e.element("XMMZWZ").getStringValue());
preproPersonEntity.setXbmzwz(e.element("XBMZWZ").getStringValue());
preproPersonEntity.setMzmzwz(e.element("MZMZWZ").getStringValue());
preproPersonEntity.setZzhymzwz(e.element("ZZHYMZWZ").getStringValue());
preproPersonEntity.setZzhemzwz(e.element("ZZHEMZWZ").getStringValue());
preproPersonEntity.setZzhsmzwz(e.element("ZZHSMZWZ").getStringValue());
preproPersonEntity.setQfjgmzwz(e.element("QFJGMZWZ").getStringValue());
}else if (preproPersonEntity.getSid().equals("010209")){
preproPersonEntity.setXmmzwz("");
preproPersonEntity.setXbmzwz("");
preproPersonEntity.setXmmzwz(e.element("TXZHM").getStringValue()); // 通行证日期
preproPersonEntity.setXbmzwz(e.element("QFCS").getStringValue()); // 签发次数
preproPersonEntity.setMzmzwz("");
preproPersonEntity.setZzhymzwz("");
preproPersonEntity.setZzhemzwz("");
preproPersonEntity.setZzhsmzwz("");
preproPersonEntity.setQfjgmzwz("");
}
preproPersonEntityList.add(preproPersonEntity);
}
resultMap.put("preproPerson",preproPersonEntityList);
......@@ -191,7 +177,7 @@ public class IDCardFactory {
* @return boolean
*/
public boolean isGAT(String fileName) {
String flag = fileName.charAt(fileName.length() - 5) + "";
String flag = fileName.charAt(fileName.length() - 9) + "";
if (flag.equals("6")) return true;
return flag.equals("7");
}
......
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