Skip to content

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

push

parent c9cdc2dd
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 17 deletions
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ abb824da
......@@ -65,6 +65,7 @@ public class ReadXmlApi {
// 将普通属性存入map中，之后调用
Map<String, String> map = new HashMap<String, String>();
List<FileItem> list = null;
Date date = new Date();
try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
......@@ -88,7 +89,7 @@ public class ReadXmlApi {
String str = YXStringUtils.inputStream2String(in, "utf-8");
in.close();
IDCardFactory idCardFactory = new IDCardFactory();
idcardsFactory(idCardFactory.extractIDCard(str));
idcardsFactory(idCardFactory.extractIDCard(str,date));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
......
src/main/java/com/yxproject/start/entity/FilesEntity.java
View file @ abb824da
......@@ -16,7 +16,7 @@ public class FilesEntity {
private String sourceFileName;
private Date newTime;
private long id;
private Date upload_date;
private Date uploadDate;
@Basic
@Column(name = "VERSION_CODE")
......@@ -98,12 +98,12 @@ public class FilesEntity {
}
@Basic
@Column(name = "UPLOAD_DATE")
public Date getUpload_date() {
return upload_date;
public Date getUploadDate() {
return uploadDate;
}
public void setUpload_date(Date upload_date) {
this.upload_date = upload_date;
public void setUploadDate(Date uploadDate) {
this.uploadDate = uploadDate;
}
@Override
......@@ -118,12 +118,12 @@ public class FilesEntity {
Objects.equals(createTime, that.createTime) &&
Objects.equals(sourceFileName, that.sourceFileName) &&
Objects.equals(id, that.id) &&
Objects.equals(upload_date, that.upload_date) &&
Objects.equals(uploadDate, that.uploadDate) &&
Objects.equals(newTime, that.newTime);
}
@Override
public int hashCode() {
return Objects.hash(versionCode, dwdm, dwmc,upload_date,id, recordNumber, createTime, sourceFileName, newTime);
return Objects.hash(versionCode, dwdm, dwmc,uploadDate,id, recordNumber, createTime, sourceFileName, newTime);
}
}
src/main/java/com/yxproject/start/mapper/FilesMapper.java
View file @ abb824da
......@@ -9,8 +9,8 @@ import java.util.List;
@Mapper
public interface FilesMapper {
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName})")
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME,UPLOAD_DATE)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName},#{uploadDate})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public long insertFiles(FilesEntity filesEntity);
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ abb824da
......@@ -528,6 +528,21 @@ public interface TaskListMapper {
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process);
/**
* 循环单查询
* 辅助库 废证
* @param process 工序
* @return
*/
@Select("select DISTINCT task.submit_date, FAILED_CARD.FAILED_CARD_ID task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO group_No,\n" +
"0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where FAILED_CARD.STATE = #{process} order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process") long process);
/**
* 任务单查询历史
* 辅助库 余证
......@@ -583,6 +598,25 @@ public interface TaskListMapper {
" and PRINT_OUT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind2(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME," +
// "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
"'余证' CARD_TYPE ,\n" +
"'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
"left join task on special_card.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and PRINT_OUT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed2(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
......@@ -678,6 +712,31 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process);
// /**
// * 任务单查询
// * 辅助库、制证库 余证
// * @param process 工序
// * @return
// */
// @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
// "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
// "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
// "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
// "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
// "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
// "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
// "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
// "group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
// "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
// " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
// " where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} " +
// "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
// "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
// "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO")
// public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process);
/**
*按时间、区、派出所查询受理库数据
......
src/main/java/com/yxproject/start/service/ImportXmlService.java
View file @ abb824da
......@@ -13,7 +13,6 @@ import java.util.List;
public interface ImportXmlService {
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity);
public List<CountDataEntity> queryPersonXml(String importDate, long maxNum, long minNum);
public int queryPersonXmlCount(String importDate);
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ abb824da
......@@ -234,10 +234,13 @@ public class TaskListServiceImpl implements TaskListService {
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
//查询余证组号列表 在辅助库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
//查询废证组号列表 在辅助库中
List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process);
List list = new ArrayList();
list = formateMap(mapList_common);
list.addAll(formateMap(mapList_fast));
list.addAll(formateMap(mapList_remaind));
list.addAll(formateMap(mapList_failed));
return list;
}
......@@ -258,10 +261,14 @@ public class TaskListServiceImpl implements TaskListService {
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
//查询余证组号列表 在辅助库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
//查询废证组号列表 在辅助库中
List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process);
List<Map<String, Object>> list = new ArrayList<>();
list = formateMap(mapList_common);
list.addAll(formateMap(mapList_fast));
list.addAll(formateMap(mapList_remaind));
list.addAll(formateMap(mapList_failed));
int total = 0;
for (Map<String, Object> map : list) {
total += Integer.valueOf(map.get("typeSum").toString());
......@@ -290,10 +297,13 @@ public class TaskListServiceImpl implements TaskListService {
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process);
//查询余证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process);
//查询余证组号列表 在辅助库、制证库中
// List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process);
List<Map<String, Object>> list = new ArrayList<>();
list = formateMap2(mapList_common);
list.addAll(formateMap2(mapList_fast));
list.addAll(formateMap2(mapList_remaind));
// list.addAll(formateMap2(mapList_failed));
return list;
}
......
src/main/java/com/yxproject/start/utils/IDCardFactory.java
View file @ abb824da
......@@ -19,7 +19,7 @@ public class IDCardFactory {
* @return 返回xml包Map
* @throws Exception
*/
public Map<String, Object> extractIDCard(String file) throws Exception {
public Map<String, Object> extractIDCard(String file,Date date) throws Exception {
Map<String,Object> resultMap = new HashMap<>();
List<PreproPersonEntity> preproPersonEntityList = new ArrayList<>();
......@@ -35,13 +35,10 @@ public class IDCardFactory {
filesEntity.setDwdm(DWDM);
String BBH = packagehead.element("BBH").getTextTrim();
filesEntity.setVersionCode(BBH);
filesEntity.setUploadDate(date);
String DWMC = packagehead.element("DWMC").getTextTrim();
filesEntity.setDwmc(DWMC);
Date date = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreateTime(packagehead.element("SCSJ").getTextTrim());
filesEntity.setUpload_date(new Date());
List<Element> recordlist = records.elements("RECORD");
for (Element e : recordlist) {
PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
......@@ -70,7 +67,6 @@ public class IDCardFactory {
preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue());
preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue());
preproPersonEntityList.add(preproPersonEntity);
System.out.println(preproPersonEntity.getJmsfzslh()+"--------------");
}
resultMap.put("preproPerson",preproPersonEntityList);
filesEntity.setRecordNumber((long)recordlist.size());
......
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