Skip to content

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

修改库房打签 去掉北京市公安局 

修改xml解析 适配包头中添加的北京市公安局-异地首申由本地系统生成xml，但是在异地辅助系统中解析生成制证包，并且在异地系统中制证
parent 25f978f4
Show whitespace changes
Inline Side-by-side
Showing with 169 additions and 37 deletions
pom.xml
View file @ 73bc9418
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.yxproject</groupId>
<artifactId>start</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>start</name>
<description>Demo project for Spring Boot</description>
</parent>
<groupId>com.yxproject</groupId>
<artifactId>start_yd</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>start_yd</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
......
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 73bc9418
......@@ -85,7 +85,7 @@ public class ExportXMLApi {
//区分邮寄证和大批证件类型
//大批证
if (cardTypeId == 0) {
if (cardTypeId == 0 || cardTypeId == 10) {
List list = new ArrayList();
List<PreproPersonDto> preproPersonEntityList = (List<PreproPersonDto>) map.get(cardTypeId);
Map<String, Object> mapFileId = new LinkedHashMap<>();
......@@ -211,6 +211,10 @@ public class ExportXMLApi {
* @throws IOException 可能出现文件写入不成功
*/
private String createToMakePackageXML(List<PreproPersonDto> preproPersonEntities, FilesEntity filesEntity, String url) throws IOException,ParseException {
// 重新设置包名中的类型代码为0或9
long cardTypeTem = preproPersonEntities.get(0).getCardTypeId();
if (cardTypeTem == 10) cardTypeTem = 0;
if (cardTypeTem == 11) cardTypeTem = 9;
Document document = DocumentHelper.createDocument();
Element PACKAGE = DocumentHelper.createElement("PACKAGE");
document.setRootElement(PACKAGE);
......@@ -221,7 +225,11 @@ public class ExportXMLApi {
Element DWDM = PACKAGEHEAD.addElement("DWDM");
DWDM.setText(filesEntity.getDwdm());
Element DWMC = PACKAGEHEAD.addElement("DWMC");
if (preproPersonEntities.get(0).getCardTypeId() == 10) {
DWMC.setText("北京市公安局" + filesEntity.getDwmc());
} else {
DWMC.setText(filesEntity.getDwmc());
}
Element JLS = PACKAGEHEAD.addElement("JLS");
JLS.setText(preproPersonEntities.size() + "");
Element SCSJ = PACKAGEHEAD.addElement("SCSJ");
......@@ -235,11 +243,11 @@ public class ExportXMLApi {
long l = newFilesService.saveNewFiles(newFilesEntity);
String xml_seq = querySequenceSercive.selectSequenceNextValue("XML_SEQ");
String files_seq = autoGenericCode(xml_seq, 4);
newFilesEntity.setNewFileName("ZAGL_ZZJH_" + filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + preproPersonEntities.get(0).getCardTypeId() + files_seq);
newFilesEntity.setNewFileName("ZAGL_ZZJH_" + filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + cardTypeTem + files_seq);
newFilesService.updateNewFileName(newFilesEntity);
Element SJBBH = PACKAGEHEAD.addElement("SJBBH");
SJBBH.setText(filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + preproPersonEntities.get(0).getCardTypeId() + files_seq);
SJBBH.setText(filesEntity.getDwdm() + getCurrentDate2String("yyyyMMdd") + cardTypeTem + files_seq);
int NO = 1;
long cardType = 0;
for (PreproPersonDto preproPersonEntity : preproPersonEntities) {
......@@ -295,7 +303,8 @@ public class ExportXMLApi {
NO++;
preproPersonEntity.setNewFileId(newFilesEntity.getId());
cardType = preproPersonEntity.getCardTypeId();
if (cardType == 10) cardType = 0;
if (cardType == 11) cardType = 9;
//民族文字 sid=010210
if (preproPersonEntity.getSid().equals("010210")){
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 73bc9418
......@@ -631,10 +631,9 @@ public class PersonPostApi {
@RequestParam("strDate") String strDate, @RequestParam("endDate") String endDate) throws Exception {
String remoteAddr = request.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONArray jsonArray = new JSONArray();
try {
List<Map<String,Object>> list = personPostService.downloadUploadInfo(request, response, replaceDate(strDate),replaceDate(endDate));
String name=replaceDate(strDate)+"-"+replaceDate(endDate);
String name = replaceDate(strDate)+"-"+replaceDate(endDate);
exportUploadInfoExcel(request, response, list,name);
} catch (Exception e) {
logger.error("上传时间：" + strDate + endDate );
......@@ -852,6 +851,7 @@ public class PersonPostApi {
*/
@RequestMapping("getPostInfoAtMachine")
public List<PersonPostDto> getPostInfoAtMachine(@RequestBody ReadCardDto readCardDto) {
logger.debug("机器刷卡："+ readCardDto.toString());
return personPostService.getPostInfoAtMachine(readCardDto);
}
......@@ -863,14 +863,17 @@ public class PersonPostApi {
*/
@RequestMapping("updatePrintDateAtMachine")
public Map<String, Object> updatePrintDateAtMachine(@RequestParam("id") int id) throws ParseException {
logger.debug("收到机打回馈："+ id);
Map<String, Object> map = new HashMap<>();
if (personPostService.updatePrintDateAtMachine(id, new Date())){
map.put("code",200);
map.put("msg","打印状态更新成功！");
logger.debug("机打状态更新成功"+ id);
return map;
}else {
map.put("code",201);
map.put("msg","打印状态更新失败！");
logger.debug("机打状态更新失败"+ id);
return map;
}
}
......
src/main/java/com/yxproject/start/entity/FilesEntity.java
View file @ 73bc9418
package com.yxproject.start.entity;
import lombok.ToString;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
@ToString
@Entity
@Table(name = "FILES", schema = "YINGXIN", catalog = "")
public class FilesEntity {
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 73bc9418
......@@ -40,7 +40,21 @@ public interface LogMapper {
//TODO XML的时间+post的file_id
@Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
// @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
// "WHERE JMSFZSLH in (\n" +
// "SELECT PREPRO_PERSON.JMSFZSLH \n" +
// "FROM PERSON_POST \n" +
// "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
// "LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID "+
// "WHERE (PERSON_POST.STATE1 = 3 OR PERSON_POST.STATE1 = 0) " +
// "AND PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ " +
// "AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )")
// public boolean changeCardTypeByPrintDate(@Param("printDate")String printDate);
@Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID = CASE " +
" WHEN CARD_TYPE_ID = 0 THEN 9 " +
" WHEN CARD_TYPE_ID = 10 THEN 11 " +
" ELSE CARD_TYPE_ID " +
" END \n" +
"WHERE JMSFZSLH in (\n" +
"SELECT PREPRO_PERSON.JMSFZSLH \n" +
"FROM PERSON_POST \n" +
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 73bc9418
......@@ -183,7 +183,7 @@ public interface PersonPostMapper {
"left join files fi\n" +
"on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"on substr(dwdm,0,6)=cd.COUNTY_CODE\n" +
"where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=0\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " +
......@@ -196,13 +196,75 @@ public interface PersonPostMapper {
"left join files fi\n" +
"on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"on substr(dwdm,0,6)=cd.COUNTY_CODE\n" +
"where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=9\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID ) datab\n" +
"on dataa.DWDM=datab.DWDM")
public List<Map<String,Object>> downloadUploadInfo(@Param("strDate")String strDate, @Param("endDate")String endDate);
// @Select("SELECT "
// + "dataa.*, "
// + "datab.typeid, "
// + "datab.cstr "
// + "FROM "
// + "( "
// + " SELECT "
// + " cd.COUNTYNAME, "
// + " fi.DWDM DWDM, "
// + " CASE "
// + " WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) "
// + " ELSE fi.DWMC "
// + " END AS dwmc1, "
// + " pp.CARD_TYPE_ID aa, "
// + " COUNT(pp.CARD_TYPE_ID) dd "
// + " FROM "
// + " prepro_person pp "
// + " LEFT JOIN files fi ON pp.FILE_ID = fi.id "
// + " LEFT JOIN COUNTY_DIC cd ON SUBSTR(dwdm, 0, 6) = cd.COUNTY_CODE "
// + " WHERE "
// + " pp.YXQQSRQ BETWEEN '20231116' AND '20231116' AND "
// + " pp.CARD_TYPE_ID = 0 "
// + " GROUP BY "
// + " cd.COUNTYNAME, "
// + " fi.DWDM, "
// + " CASE "
// + " WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) "
// + " ELSE fi.DWMC "
// + " END, "
// + " pp.CARD_TYPE_ID "
// + " ORDER BY "
// + " fi.DWDM "
// + ") dataa "
// + "LEFT JOIN "
// + "( "
// + " SELECT "
// + " cd.COUNTYNAME, "
// + " fi.DWDM DWDM, "
// + " CASE "
// + " WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) "
// + " ELSE fi.DWMC "
// + " END AS dwmc1, "
// + " pp.CARD_TYPE_ID typeid, "
// + " COUNT(pp.CARD_TYPE_ID) cstr "
// + " FROM "
// + " prepro_person pp "
// + " LEFT JOIN files fi ON pp.FILE_ID = fi.id "
// + " LEFT JOIN COUNTY_DIC cd ON SUBSTR(dwdm, 0, 6) = cd.COUNTY_CODE "
// + " WHERE "
// + " pp.YXQQSRQ BETWEEN '20231116' AND '20231116' AND "
// + " pp.CARD_TYPE_ID = 9 "
// + " GROUP BY "
// + " cd.COUNTYNAME, "
// + " fi.DWDM, "
// + " CASE "
// + " WHEN SUBSTR(fi.DWMC, 1, 3) = '北京市' THEN SUBSTR(fi.DWMC, 7) "
// + " ELSE fi.DWMC "
// + " END, "
// + " pp.CARD_TYPE_ID "
// + ") datab ON dataa.DWDM = datab.DWDM")
// List<Map<String,Object>> downloadUploadInfo2(@Param("strDate")String strDate, @Param("endDate")String endDate);
@Select("select count(*) from PERSON_POST\n" +
" where FILE_ID <>#{fileID}\n" +
" and WAYBILL_NUMBER in \n" +
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ 73bc9418
......@@ -15,9 +15,9 @@ public interface PreproPersonMapper {
/*导入XMl*/
@Insert("INSERT INTO PREPRO_PERSON (JMSFZSLH,GMSFHM,XM,XBDM,MZDM,CSRQ,SSXQDM,DZMC," +
"QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID,FILE_ID,TP_PATH," +
"XMMZWZ,XBMZWZ,MZMZWZ,ZZHYMZWZ,ZZHEMZWZ,ZZHSMZWZ,QFJGMZWZ)" +
"XMMZWZ,XBMZWZ,MZMZWZ,ZZHYMZWZ,ZZHEMZWZ,ZZHSMZWZ,QFJGMZWZ,CARD_TYPE_ID)" +
"VALUES(#{jmsfzslh},#{gmsfhm},#{xm},#{xbdm},#{mzdm},#{csrq},#{ssxqdm},#{dzmc},#{qfjgGajgmc},#{yxqqsrq},#{yxqjzrq},#{jmsfzslyydm},#{jmsfzzzlxdm},#{jmsfzlzfsdm},#{sjrXm},#{sjrLxdh},#{sjrYzbm}," +
"#{sjrTxdz},#{sid},#{fileId},#{tpPath},#{xmmzwz},#{xbmzwz},#{mzmzwz},#{zzhymzwz},#{zzhemzwz},#{zzhsmzwz},#{qfjgmzwz})")
"#{sjrTxdz},#{sid},#{fileId},#{tpPath},#{xmmzwz},#{xbmzwz},#{mzmzwz},#{zzhymzwz},#{zzhemzwz},#{zzhsmzwz},#{qfjgmzwz},#{cardTypeId})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public boolean savePreproPersonEntity(PreproPersonDto preproPersonDto);
......
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ 73bc9418
......@@ -92,6 +92,10 @@ public class ImportXmlServiceImpl implements ImportXmlService {
}
try {
preproPersonDto.setTpPath(url);
preproPersonDto.setCardTypeId(0L);
if (personIsYdss(preproPersonDto.getJmsfzslh())) {
preproPersonDto.setCardTypeId(10L);
}
boolean b = preproPersonMapper.savePreproPersonEntity(preproPersonDto);
if (!b){
logger.error(preproPersonDto.getFileId()+"存儲失敗！");
......@@ -117,4 +121,16 @@ public class ImportXmlServiceImpl implements ImportXmlService {
// return 2;
return filesMapper.selectFilesCount(importDate).size();
}
/**
* 从受理号判断是否为异地首申 受理号倒数第5位为9
* @param jmsfzslh 受理号
* @return true 是异地首申
*/
protected boolean personIsYdss(String jmsfzslh) {
System.out.println("11111111111");
System.out.println(jmsfzslh);
System.out.println("22222222222");
return jmsfzslh.charAt(jmsfzslh.length() - 5) == '9';
}
}
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 73bc9418
......@@ -84,7 +84,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
item.show = !item.show;
$scope.json.id=item.ID;
$scope.json.policeName = item.GAJG_MC;
$scope.json.policeName = item.GAJG_MC.substring(6);
$scope.json.policeCode = item.POLICE_CODE;
$scope.json.count = item.FINISH_COUNT;
$scope.json.QR_CODE = item.QR_CODE;
......
src/test/java/com/yxproject/start/StartApplicationTests.java
View file @ 73bc9418
package com.yxproject.start;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class StartApplicationTests {
@Test
public void contextLoads() {
}
}
//package com.yxproject.start;
//
//import com.yxproject.start.entity.PersonPostEntity;
//import com.yxproject.start.mapper.PersonPostMapper;
//import com.yxproject.start.service.GkDicService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import java.util.List;
//import java.util.Map;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class StartApplicationTests {
// @Autowired
// private PersonPostMapper mapper;
// @Autowired
// private GkDicService gkDicService;
// @Test
// public void contextLoads() {
// long startTime = System.currentTimeMillis();
// Map<String, Long> gkMap = gkDicService.getGkDicMap();
//// personPostEntity.setGk(gkMap);
//// System.out.println(mapper.getAllCountByCreateDate("2023-01-01", "2023-06-31"));
//// System.out.println(mapper.getIdByCreateDate("2023-01-01", "2023-01-31").size());
//// mapper.addGk(id, gk);
// List<PersonPostEntity> entities = mapper.findAllByCreateDate("2023-03-01", "2023-04-01");
// System.out.println(entities.size());
// int count = 0;
// for (PersonPostEntity entity : entities) {
// entity.setGk(gkMap);
// if (mapper.addGk(entity.getId(), entity.getGk())) count += 1;
// }
// System.out.println(count);
// System.out.println(System.currentTimeMillis() - startTime);
// }
//
//}
//
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