Skip to content

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

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

parents 604096b5 6aa5dbf5
Hide whitespace changes
Inline Side-by-side
Showing with 977 additions and 805 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ e5645b65
package com.yxproject.start.api;
import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.NewFilesEntity;
import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.service.NewFilesService;
import com.yxproject.start.service.PreproPersonService;
import com.yxproject.start.utils.ExportXml;
import com.yxproject.start.utils.QuerySequenceSercive;
import org.apache.commons.lang.time.DateFormatUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
......@@ -28,43 +32,173 @@ import java.util.List;
public class ExportXMLApi {
@Autowired
private PreproPersonService preproPersonService;
@Autowired
private NewFilesService newFilesService;
@Autowired
private QuerySequenceSercive querySequenceSercive;
/**
* 导出制证数据包
*/
@RequestMapping("printXmlData")
// @RequiresPermissions("userInfo.add")//权限管理;
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("uploadDate")String uploadDate, HttpServletResponse response){
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("uploadDate")String uploadDate, HttpServletResponse response) {
response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
// //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件
String fout = null;
List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
FilesEntity filesEntity = new FilesEntity();
filesEntity.setVersionCode("3.00");
filesEntity.setDwdm("410600000000");
filesEntity.setDwmc("北京市公安局");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreatTime(simpleDateFormat.format(new Date()));
try {
ExportXml.createToMakePackageXML(preproPersonEntities,filesEntity,"\\zhang");
} catch (IOException e) {
e.printStackTrace();
if (preproPersonEntities.size()>0){
FilesEntity filesEntity = new FilesEntity();
filesEntity.setVersionCode("3.00");
filesEntity.setDwdm("410600000000");
filesEntity.setDwmc("北京市公安局");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreatTime(simpleDateFormat.format(new Date()));
try {
fout = createToMakePackageXML(preproPersonEntities, filesEntity, "\\zhang");
} catch (IOException e) {
e.printStackTrace();
}
String outFile = dateTime + "制证数据包";
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
fis.read(b);
fis.close();
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xml");
return b;
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}else {
}
return null;
}
/**
* 生成单个可制证数据XML
*
* @throws IOException 可能出现文件写入不成功
*/
public String createToMakePackageXML(List<PreproPersonEntity> preproPersonEntities , FilesEntity filesEntity, String url) throws IOException {
//todo 添加生成新包 回写到个人制证信息表中
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyyMMddhhmmss");
Document document = DocumentHelper.createDocument();
Element PACKAGE = DocumentHelper.createElement("PACKAGE");
document.setRootElement(PACKAGE);
Element PACKAGEHEAD = PACKAGE.addElement("PACKAGEHEAD");
Element DATA = PACKAGE.addElement("DATA");
Element BBH = PACKAGEHEAD.addElement("BBH");
BBH.setText(filesEntity.getVersionCode());
Element DWDM = PACKAGEHEAD.addElement("DWDM");
DWDM.setText(filesEntity.getDwdm());
Element DWMC = PACKAGEHEAD.addElement("DWMC");
DWMC.setText(filesEntity.getDwmc());
Element JLS = PACKAGEHEAD.addElement("JLS");
JLS.setText(preproPersonEntities.size()+"");
Element SCSJ = PACKAGEHEAD.addElement("SCSJ");
SCSJ.setText(simpleDateFormat2.format(new Date()));
NewFilesEntity newFilesEntity = new NewFilesEntity();
newFilesEntity.setCreateDate(simpleDateFormat2.format(new Date()));
newFilesEntity.setDwdm(filesEntity.getDwdm());
newFilesEntity.setDwmc(filesEntity.getDwmc());
newFilesEntity.setVersionCode(filesEntity.getVersionCode());
newFilesEntity.setRecordNumber((long)preproPersonEntities.size());
long l = newFilesService.saveNewFiles(newFilesEntity);
newFilesEntity.setNewFileName(simpleDateFormat.format(new Date())+"-"+l);
newFilesService.updateNewFileName(newFilesEntity);
int NO=1;
for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
Element RECORD = DATA.addElement("RECORD");
RECORD.addAttribute("no", NO+"");
RECORD.addAttribute("sid", preproPersonEntity.getSid());
Element JMSFZSLH = RECORD.addElement("JMSFZSLH");
JMSFZSLH.setText(preproPersonEntity.getJmsfzslh());
Element GMSFHM = RECORD.addElement("GMSFHM");
GMSFHM.setText(preproPersonEntity.getGmsfhm());
Element XM = RECORD.addElement("XM");
XM.setText(replaceNullString(preproPersonEntity.getXm()));
Element XBDM = RECORD.addElement("XBDM");
XBDM.setText(replaceNullString(preproPersonEntity.getXbdm()));
Element MZDM = RECORD.addElement("MZDM");
MZDM.setText(replaceNullString(preproPersonEntity.getMzdm()));
Element CSRQ = RECORD.addElement("CSRQ");
CSRQ.setText(replaceNullString(preproPersonEntity.getCsrq()));
Element SSXQDM = RECORD.addElement("SSXQDM");
SSXQDM.setText(replaceNullString(preproPersonEntity.getSsxqdm()));
Element DZMC = RECORD.addElement("DZMC");
DZMC.setText(replaceNullString(preproPersonEntity.getDzmc()));
Element SDXP = RECORD.addElement("SDXP");
SDXP.setText(replaceNullString(preproPersonEntity.getSdxp()));
Element ZWY_ZWTXSJ = RECORD.addElement("ZWY_ZWTXSJ");
ZWY_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtxsj()));
Element ZWY_ZWTZSJ = RECORD.addElement("ZWY_ZWTZSJ");
ZWY_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtzsj()));
Element ZWE_ZWTXSJ = RECORD.addElement("ZWE_ZWTXSJ");
ZWE_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZweZwtxsj()));
Element ZWE_ZWTZSJ = RECORD.addElement("ZWE_ZWTZSJ");
ZWE_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZweZwtzsj()));
Element QFJG_GAJGMC = RECORD.addElement("QFJG_GAJGMC");
QFJG_GAJGMC.setText(replaceNullString(preproPersonEntity.getQfjgGajgmc()));
Element YXQQSRQ = RECORD.addElement("YXQQSRQ");
YXQQSRQ.setText(preproPersonEntity.getYxqqsrq());
Element YXQJZRQ = RECORD.addElement("YXQJZRQ");
YXQJZRQ.setText(preproPersonEntity.getYxqjzrq());
Element JMSFZSLYYDM = RECORD.addElement("JMSFZSLYYDM");
JMSFZSLYYDM.setText(preproPersonEntity.getJmsfzslyydm());
Element JMSFZZZLXDM = RECORD.addElement("JMSFZZZLXDM");
JMSFZZZLXDM.setText(preproPersonEntity.getJmsfzzzlxdm());
Element JMSFZLZFSDM = RECORD.addElement("JMSFZLZFSDM");
JMSFZLZFSDM.setText(preproPersonEntity.getJmsfzlzfsdm());
Element SJR_XM = RECORD.addElement("SJR_XM");
SJR_XM.setText(replaceNullString(preproPersonEntity.getSjrXm()));
Element SJR_LXDH = RECORD.addElement("SJR_LXDH");
SJR_LXDH.setText(replaceNullString(preproPersonEntity.getSjrLxdh()));
Element SJR_YZBM = RECORD.addElement("SJR_YZBM");
SJR_YZBM.setText(replaceNullString(preproPersonEntity.getSjrYzbm()));
Element SJR_TXDZ = RECORD.addElement("SJR_TXDZ");
SJR_TXDZ.setText(replaceNullString(preproPersonEntity.getSjrTxdz()));
NO++;
preproPersonEntity.setNewFileId(l);
}
String outFile = dateTime + "制证数据包";
preproPersonService.updatePreproPerson_NewFileName(preproPersonEntities);
FileOutputStream fout = null;
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
fis.read(b);
fis.close();
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xml");
return b;
} catch (FileNotFoundException e) {
e.printStackTrace();
FileOutputStream fos = new FileOutputStream("D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+l+ ".xml");
OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8");
OutputFormat of = new OutputFormat();
of.setEncoding("UTF-8");
of.setIndent(true);
of.setIndent(" ");
of.setNewlines(true);
of.setNewLineAfterDeclaration(false);
XMLWriter writer = new XMLWriter(osw, of);
writer.write(document);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
return null;
System.out.println("XML文件生成成功..." + new Date());
return "D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+l+ ".xml";
}
/**
* 字符串去除空格
* @param str 原始字符串
* @return 返回新的字符串
*/
public static String replaceNullString(String str) {
if (str == null) return "";
else return str;
}
}
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ e5645b65
......@@ -22,13 +22,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
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.*;
/**
......@@ -51,10 +46,7 @@ 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();
......
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ e5645b65
......@@ -70,7 +70,7 @@ public class ReadXmlApi {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext());
// 判断是否是多数据段提交格式
// 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
Iterator<String> iter = multiRequest.getFileNames();
......@@ -79,7 +79,7 @@ public class ReadXmlApi {
try {
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称，
// 得到上传的文件名称
filename = item.getName();
if (filename == null || filename.trim().equals("")) {
continue;
......
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ e5645b65
package com.yxproject.start.api;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.entity.resp.*;
import com.yxproject.start.service.SelectSerialNumberService;
import com.yxproject.start.utils.YXJSONResponse;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,7 +21,8 @@ import java.util.Map;
@RequestMapping("specialCardInfo")
public class SelectApi {
/**
* 根据 组号、受理号、身份证号、任务单号查询
* 根据 组号8、受理号10、身份证号18、任务单号查询11
*
*/
@Autowired
private SelectSerialNumberService selectSerialNumberService;
......@@ -32,54 +30,65 @@ public class SelectApi {
@RequestMapping(value = "selectByCard")
public String selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
resp.setCharacterEncoding("UTF-8");
List<String> list = new ArrayList<>();
List<Map<String, Object>> resultList = new ArrayList<>();
/*任务单*/
Map<String,Object> taskListMap = new HashMap<>();
/*受理库*/
Map<String,Object> acceptMap = new HashMap<>();
/*制证库*/
Map<String,Object> accreditationMap = new HashMap<>();
Map<String, Object> map = new HashMap<>();
if (id.length() ==11){
try {
SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
map.put("searchResult",specialCardInfo4);
}catch (Exception e){
e.printStackTrace();
}
SelectFromTaskListEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderFromYX(id);
taskListMap.put("workOrderDate",specialCardInfo4);
resultList.add(taskListMap);
resultList.add(acceptMap);
resultList.add(accreditationMap);
}else {
switch (id.length()) {
case 8:
try {
SelectByGroupNumEntity specialCardInfo = selectSerialNumberService.selectByGroupNumberFromACC(id);
if (specialCardInfo.getGroup_No()!=null&specialCardInfo.getGroup_No()!=""){
map.put("searchResult", specialCardInfo);
}else {
SelectByGroupNumEntity selectResulr = selectSerialNumberService.selectByGroupNumberFromYX(id);
}
} catch (Exception e) {
e.printStackTrace();
}
SelectFromTaskListEntity specialCardInfo = selectSerialNumberService.selectByGroupNoFromYX(id);
SelectFromProdEntity selectResult = selectSerialNumberService.selectByGroupNoFromProd(id);
SelectFromAccEntity specialCardInfo4 = selectSerialNumberService.selectByGroupNoFromAcc(id);
taskListMap.put("yxData",specialCardInfo);
accreditationMap.put("prodData",selectResult);
acceptMap.put("accData",specialCardInfo4);
resultList.add(taskListMap);
resultList.add(accreditationMap);
resultList.add(acceptMap);
break;
case 10:
try {
SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
map.put("searchResult", specialCardInfo2);
} catch (Exception e) {
e.printStackTrace();
}
SelectFromTaskListEntity specialCardInfo2 = selectSerialNumberService.selectByAcceptFromYX(id);
SelectFromProdEntity selectResult2 = selectSerialNumberService.selectByAcceptFromProd(id);
SelectFromAccEntity specialCardInfo5 = selectSerialNumberService.selectByAcceptFromAcc(id);
taskListMap.put("yxData",specialCardInfo2);
accreditationMap.put("prodData",selectResult2);
acceptMap.put("accData",specialCardInfo5);
resultList.add(taskListMap);
resultList.add(accreditationMap);
resultList.add(acceptMap);
break;
case 18:
try {
SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
map.put("searchResult", specialCardInfo3);
} catch (Exception e) {
e.printStackTrace();
}
SelectFromTaskListEntity specialCardInfo3 = selectSerialNumberService.selectByCardIdFromYX(id);
SelectFromProdEntity selectResult3 = selectSerialNumberService.selectByCardIdFromProd(id);
SelectFromAccEntity specialCardInfo6 = selectSerialNumberService.selectByCardIdFromAcc(id);
taskListMap.put("yxData",specialCardInfo3);
accreditationMap.put("prodData",selectResult3);
acceptMap.put("accData",specialCardInfo6);
resultList.add(taskListMap);
resultList.add(accreditationMap);
resultList.add(acceptMap);
break;
}
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(map);
yxjsonResponse.outPutSuccess(resultList);
return yxjsonResponse.toJSONString();
}
......
src/main/java/com/yxproject/start/api/fakeApi/PackageInformationApi.java
View file @ e5645b65
......@@ -88,7 +88,6 @@ public class PackageInformationApi {
jsonStr7.put("cardType ","普通证");
list.add(jsonStr7);
map.put("commonCardCount",2300);
map.put("postCardCount",1200);
map.put("forbiddenCount",2);
......
src/main/java/com/yxproject/start/api/fakeApi/SelectExcelApi.java
View file @ e5645b65
......@@ -117,8 +117,6 @@ public class SelectExcelApi {
countyList.add(jsonStr10);
countyList.add(jsonStr11);
return countyList.toString();
}
......
src/main/java/com/yxproject/start/api/fakeApi/SortingGroupListApi.java
View file @ e5645b65
......@@ -18,7 +18,7 @@ public class SortingGroupListApi {
* @return
*/
@RequestMapping("sortingGroupList")
public String sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
public List<JSONObject> sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject();
......@@ -69,7 +69,7 @@ public class SortingGroupListApi {
jsonStr6.put("postCardCount",13000);
countyList.add(jsonStr6);
return countyList.toString();
return countyList;
}
}
src/main/java/com/yxproject/start/api/fakeApi/TaskListFakeApi.java
View file @ e5645b65
......@@ -4,7 +4,6 @@ import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -19,9 +18,9 @@ public class TaskListFakeApi {
* @return
*/
@RequestMapping("selectByDate")
public String selectByDate(@Param("date") String date){
public List<Map> selectByDate(@Param("date") String date){
List<String> result = new ArrayList<>();
List<Map> result = new ArrayList<>();
Map<String,Object> map1 = new HashMap<>();
Map<String,Object> map2 = new HashMap<>();
......@@ -91,11 +90,11 @@ public class TaskListFakeApi {
map2.put("list",list2);
result.add(map1.toString());
result.add(map2.toString());
result.add(map1);
result.add(map2);
return result.toString();
return result;
}
}
src/main/java/com/yxproject/start/entity/CountDataEntity.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.entity;
import javax.persistence.Entity;
public class CountDataEntity {
private String uploadDate;
private Integer packageCount;
private Integer cardCount;
private Integer commonCardCount;
private Integer postCardCount;
public String getUploadDate() {
return uploadDate;
}
public void setUploadDate(String uploadDate) {
this.uploadDate = uploadDate;
}
public Integer getPackageCount() {
return packageCount;
}
public void setPackageCount(Integer packageCount) {
this.packageCount = packageCount;
}
public Integer getCardCount() {
return cardCount;
}
public void setCardCount(Integer cardCount) {
this.cardCount = cardCount;
}
public Integer getCommonCardCount() {
return commonCardCount;
}
public void setCommonCardCount(Integer commonCardCount) {
this.commonCardCount = commonCardCount;
}
public Integer getPostCardCount() {
return postCardCount;
}
public void setPostCardCount(Integer postCardCount) {
this.postCardCount = postCardCount;
}
}
src/main/java/com/yxproject/start/entity/NewFilesEntity.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/4 18:45
*/
@Entity
@Table(name = "NEW_FILES", schema = "YINGXIN", catalog = "")
public class NewFilesEntity {
private String versionCode;
private String dwdm;
private String dwmc;
private Long recordNumber;
private String createDate;
private String newFileName;
private String newTime;
private long id;
@Basic
@Column(name = "VERSION_CODE")
public String getVersionCode() {
return versionCode;
}
public void setVersionCode(String versionCode) {
this.versionCode = versionCode;
}
@Basic
@Column(name = "DWDM")
public String getDwdm() {
return dwdm;
}
public void setDwdm(String dwdm) {
this.dwdm = dwdm;
}
@Basic
@Column(name = "DWMC")
public String getDwmc() {
return dwmc;
}
public void setDwmc(String dwmc) {
this.dwmc = dwmc;
}
@Basic
@Column(name = "RECORD_NUMBER")
public Long getRecordNumber() {
return recordNumber;
}
public void setRecordNumber(Long recordNumber) {
this.recordNumber = recordNumber;
}
@Basic
@Column(name = "CREATE_DATE")
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
@Basic
@Column(name = "NEW_FILE_NAME")
public String getNewFileName() {
return newFileName;
}
public void setNewFileName(String newFileName) {
this.newFileName = newFileName;
}
@Basic
@Column(name = "NEW_TIME")
public String getNewTime() {
return newTime;
}
public void setNewTime(String newTime) {
this.newTime = newTime;
}
@Id
@Column(name = "ID")
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NewFilesEntity that = (NewFilesEntity) o;
return id == that.id &&
Objects.equals(versionCode, that.versionCode) &&
Objects.equals(dwdm, that.dwdm) &&
Objects.equals(dwmc, that.dwmc) &&
Objects.equals(recordNumber, that.recordNumber) &&
Objects.equals(createDate, that.createDate) &&
Objects.equals(newFileName, that.newFileName) &&
Objects.equals(newTime, that.newTime);
}
@Override
public int hashCode() {
return Objects.hash(versionCode, dwdm, dwmc, recordNumber, createDate, newFileName, newTime, id);
}
}
src/main/java/com/yxproject/start/entity/PreproPersonEntity.java
View file @ e5645b65
......@@ -3,6 +3,10 @@ package com.yxproject.start.entity;
import javax.persistence.*;
import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/4 20:09
*/
@Entity
@Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
public class PreproPersonEntity {
......@@ -30,9 +34,9 @@ public class PreproPersonEntity {
private String sjrYzbm;
private String sjrTxdz;
private String sid;
private String fileName;
private Long fileId;
private Long cardTypeId;
private String newFileName;
private Long newFileId;
private Long state;
@Id
......@@ -276,13 +280,13 @@ public class PreproPersonEntity {
}
@Basic
@Column(name = "FILE_NAME")
public String getFileName() {
return fileName;
@Column(name = "FILE_ID")
public Long getFileId() {
return fileId;
}
public void setFileName(String fileName) {
this.fileName = fileName;
public void setFileId(Long fileId) {
this.fileId = fileId;
}
@Basic
......@@ -296,13 +300,13 @@ public class PreproPersonEntity {
}
@Basic
@Column(name = "NEW_FILE_NAME")
public String getNewFileName() {
return newFileName;
@Column(name = "NEW_FILE_ID")
public Long getNewFileId() {
return newFileId;
}
public void setNewFileName(String newFileName) {
this.newFileName = newFileName;
public void setNewFileId(Long newFileId) {
this.newFileId = newFileId;
}
@Basic
......@@ -344,14 +348,14 @@ public class PreproPersonEntity {
Objects.equals(sjrYzbm, that.sjrYzbm) &&
Objects.equals(sjrTxdz, that.sjrTxdz) &&
Objects.equals(sid, that.sid) &&
Objects.equals(fileName, that.fileName) &&
Objects.equals(fileId, that.fileId) &&
Objects.equals(cardTypeId, that.cardTypeId) &&
Objects.equals(newFileName, that.newFileName) &&
Objects.equals(newFileId, that.newFileId) &&
Objects.equals(state, that.state);
}
@Override
public int hashCode() {
return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileName, cardTypeId, newFileName, state);
return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
}
}
src/main/java/com/yxproject/start/entity/TaskList/CountCountyEntity.java
View file @ e5645b65
package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class CountCountyEntity {
private String countyName;
private Integer countyCount;
......
src/main/java/com/yxproject/start/entity/TaskList/CountGajgEntity.java
View file @ e5645b65
package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class CountGajgEntity {
private String gajgName;
private Integer gajgCount;
......
src/main/java/com/yxproject/start/entity/TaskList/TaskListEntity.java
View file @ e5645b65
package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class TaskListEntity {
private String countyName;
private String gajgName;
......
src/main/java/com/yxproject/start/entity/resp/SelectFromAccEntity.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.entity.resp;
public class SelectFromAccEntity {
private String acceptNo;
private String county;
private String name;
private String cardType;
private String cardId;
private String sex;
private String signGovt;
private String beginDate;
private String endDate;
private String policeStation;
private String dataState;
private String time;
public String getAcceptNo() {
return acceptNo;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getCardId() {
return cardId;
}
public void setCardId(String cardId) {
this.cardId = cardId;
}
public String getSex() {
return sex;
}
public void setSex(String sex) {
this.sex = sex;
}
public String getSignGovt() {
return signGovt;
}
public void setSignGovt(String signGovt) {
this.signGovt = signGovt;
}
public String getBeginDate() {
return beginDate;
}
public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getPoliceStation() {
return policeStation;
}
public void setPoliceStation(String policeStation) {
this.policeStation = policeStation;
}
public String getDataState() {
return dataState;
}
public void setDataState(String dataState) {
this.dataState = dataState;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
}
src/main/java/com/yxproject/start/entity/resp/SelectFromProdEntity.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.entity.resp;
public class SelectFromProdEntity {
private String acceptNo;
private String county;
private String name;
private String cardType;
private String cardId;
private String sex;
private String signGovt;
private String beginDate;
private String endDate;
private String policeStation;
private String dataState;
private String time;
public String getAcceptNo() {
return acceptNo;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getCardId() {
return cardId;
}
public void setCardId(String cardId) {
this.cardId = cardId;
}
public String getSex() {
return sex;
}
public void setSex(String sex) {
this.sex = sex;
}
public String getSignGovt() {
return signGovt;
}
public void setSignGovt(String signGovt) {
this.signGovt = signGovt;
}
public String getBeginDate() {
return beginDate;
}
public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getPoliceStation() {
return policeStation;
}
public void setPoliceStation(String policeStation) {
this.policeStation = policeStation;
}
public String getDataState() {
return dataState;
}
public void setDataState(String dataState) {
this.dataState = dataState;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
}
src/main/java/com/yxproject/start/entity/resp/SelectFromTaskListEntity.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.entity.resp;
import java.util.Date;
/**
* 根据任务单查询结果实体
* 任务单流水号 区县 制证类型 日期 数据核验 膜打印 预定位 分拣 质检 仓库
*/
public class SelectFromTaskListEntity {
private String taskId;
private String county;
private Long cardType;
private Date issuedDate;
private Date dataCheckDate;
private Date printOutDate;
private Date positionDate;
private Date sortOutDate;
private Date qualityTestDate;
private Date outStorageDate;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
public Long getCardType() {
return cardType;
}
public void setCardType(Long cardType) {
this.cardType = cardType;
}
public Date getIssuedDate() {
return issuedDate;
}
public void setIssuedDate(Date issuedDate) {
this.issuedDate = issuedDate;
}
public Date getDataCheckDate() {
return dataCheckDate;
}
public void setDataCheckDate(Date dataCheckDate) {
this.dataCheckDate = dataCheckDate;
}
public Date getPrintOutDate() {
return printOutDate;
}
public void setPrintOutDate(Date printOutDate) {
this.printOutDate = printOutDate;
}
public Date getPositionDate() {
return positionDate;
}
public void setPositionDate(Date positionDate) {
this.positionDate = positionDate;
}
public Date getSortOutDate() {
return sortOutDate;
}
public void setSortOutDate(Date sortOutDate) {
this.sortOutDate = sortOutDate;
}
public Date getQualityTestDate() {
return qualityTestDate;
}
public void setQualityTestDate(Date qualityTestDate) {
this.qualityTestDate = qualityTestDate;
}
public Date getOutStorageDate() {
return outStorageDate;
}
public void setOutStorageDate(Date outStorageDate) {
this.outStorageDate = outStorageDate;
}
}
src/main/java/com/yxproject/start/mapper/Analysis.java deleted 100644 → 0
View file @ 604096b5
package com.yxproject.start.mapper;
public interface Analysis {
}
src/main/java/com/yxproject/start/mapper/CardDetailedListMapper.java
View file @ e5645b65
......@@ -28,6 +28,6 @@ public interface CardDetailedListMapper {
@Select("SELECT upload_no,subStr(UPLOAD_NO,0,9),ID_NO,NAME FROM PROD_CARD_T@PROD_LINK WHERE subStr(ACCEPT_NO,0,8) \n" +
"IN (SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID=#{taskId} \n" +
"AND (subStr(UPLOAD_NO,0,9)=#{gajgId}));")
public List<CardDetailedListEntity> selectCardDetiledListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
public List<CardDetailedListEntity> selectCardDetailedListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
}
src/main/java/com/yxproject/start/mapper/FilesMapper.java
View file @ e5645b65
package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface FilesMapper {
......@@ -10,4 +14,9 @@ public interface FilesMapper {
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})")
public boolean insertFiles(FilesEntity filesEntity);
@Select("")
public List<CountDataEntity> selectFilesCount();
}
src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ e5645b65
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
@Mapper
public interface GroupNoMapper {
/**
......
src/main/java/com/yxproject/start/mapper/NewFilesMapper.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.mapper;
import com.yxproject.start.entity.NewFilesEntity;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Update;
/**
* @auther zhangyusheng
* 2019/3/4 18:46
*/
@Mapper
public interface NewFilesMapper {
@Insert("INSERT INTO NEW_FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_DATE) VALUES (#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createDate})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public long saveNewFiles(NewFilesEntity newFilesEntity);
@Update("UPDATE NEW_FILES SET NEW_FILE_NAME = #{newFileName} WHERE ID = #{id}")
public boolean updateNewFileName(NewFilesEntity newFilesEntity);
}
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ e5645b65
......@@ -24,21 +24,42 @@ public interface PreproPersonMapper {
/*按条件查询制证数据*/
@Select("select * from PREPRO_PERSON \n" +
"left join files on PREPRO_PERSON.FILE_ID = files.ID\n" +
"left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
"where 1=1 " +
" <when test='uploadNo!=null'> and PREPRO_PERSON.JMSFZSLH = #{uploadNo} </when>" +
" <when test='IDCard!=null'> and GMSFHM = #{IDCard} </when> " +
" <when test='oldFile!=null'> and files.SOURCE_FILE_NAME =#{oldFile} </when> " +
" <when test='newFile!=null'> and NEW_FILES.NEW_FILE_NAME = #{newFile} </when> " +
" <when test='SSXQDM!=null'> and PREPRO_PERSON.SSXQDM =#{SSXQDM} </when> " +
" <when test='cardType!=null'> and PREPRO_PERSON.CARD_TYPE_ID =#{cardType} </when> " +
" <when test='state!=null'> and PREPRO_PERSON.state = #{state} </when> " +
" <when test='uploadDate!=null'> and files.CREAT_TIME = #{uploadDate} </when> ")
@Select({"<script>"+
"select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID "+
"<where> " +
" 1=1" +
"<if test='uploadNo != null '>"+
"and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
"</if>"+
" <if test='IDCard != null '> ",
"and GMSFHM = #{IDCard} ",
"</if> " ,
" <if test='oldFile != null '> ",
"and files.SOURCE_FILE_NAME =#{oldFile} ",
" </if> " ,
" <if test='newFile != null'> ",
"and NEW_FILES.NEW_FILE_NAME = #{newFile}",
" </if> " ,
" <if test='SSXQDM != null '> ",
"and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
" </if>" ,
" <if test='cardType != null '>",
" and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
" </if> " ,
" <if test='state != null'>",
" and PREPRO_PERSON.state = #{state}",
" </if> " ,
" <if test='uploadDate != null '>",
" and files.CREAT_TIME = #{uploadDate}",
" </if> ",
"</where>"+
"</script>"})
public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate);
/*修改标记制证数据状态*/
@Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
public boolean updateState (@Param("state")String state, @Param("acceptNo") String acceptNo);
@Update("UPDATE PREPRO_PERSON SET NEW_FILE_ID=#{newFileId} where JMSFZSLH=#{jmsfzslh}")
public boolean updateNewFileName(PreproPersonEntity personEntity);
}
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/QuerySequenceMapper.java
View file @ e5645b65
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
......@@ -9,6 +10,6 @@ import org.apache.ibatis.annotations.Select;
*/
@Mapper
public interface QuerySequenceMapper {
@Select("select #{sequenceName} from dual")
public String selectSequenceNextValue(String sequenceName);
@Select("select #{sequenceName},#{sequenceName} as num2 from dual")
public Object[] selectSequenceNextValue(@Param("sequenceName") String sequenceName);
}
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ e5645b65
package com.yxproject.start.mapper;
import com.yxproject.start.entity.resp.SelectFromAccEntity;
import com.yxproject.start.entity.resp.SelectFromProdEntity;
import com.yxproject.start.entity.resp.SelectFromTaskListEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
......@@ -94,4 +97,34 @@ public interface SelectSerialNumberMapper {
" LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
" where TASK_ID =#{id}")
public Map<String,Object> selectByWorkOrderNumber(String id);
@Select("")
public Map<String,SelectFromTaskListEntity> selectByWorkOrderFromYX();
@Select("")
public Map<String, SelectFromAccEntity> selectByWorkOrderFromACC();
@Select("")
public Map<String,SelectFromTaskListEntity> selectByAcceptFromYX();
@Select("")
public Map<String,SelectFromAccEntity> selectByAcceptFromAcc();
@Select("")
public Map<String, SelectFromProdEntity>selectByAcceptFromProd();
@Select("")
public Map<String,SelectFromTaskListEntity> selectByGroupNoFromYX();
@Select("")
public Map<String,SelectFromProdEntity> selectByGroupNoFromProd();
@Select("")
public Map<String,SelectFromAccEntity> selectByGroupNoFromAcc();
@Select("")
public Map<String,SelectFromTaskListEntity>selectByCardIdFromYX();
@Select("")
public Map<String,SelectFromAccEntity> selectByCardIdFromAcc();
@Select("")
public Map<String,SelectFromProdEntity> selectByCardIdFromProd();
}
src/main/java/com/yxproject/start/service/CardDetailedListService.java
View file @ e5645b65
......@@ -12,7 +12,7 @@ import java.util.List;
public interface CardDetailedListService {
public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId);
public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId);
public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
......
src/main/java/com/yxproject/start/service/NewFilesService.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.service;
import com.yxproject.start.entity.NewFilesEntity;
/**
* @auther zhangyusheng
* 2019/3/4 18:47
*/
public interface NewFilesService {
public long saveNewFiles(NewFilesEntity newFilesEntity);
public boolean updateNewFileName(NewFilesEntity newFilesEntity);
}
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ e5645b65
......@@ -25,4 +25,5 @@ public interface PersonPostService {
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
}
src/main/java/com/yxproject/start/service/PreproPersonService.java
View file @ e5645b65
......@@ -12,5 +12,8 @@ public interface PreproPersonService {
public boolean uploadState(String acceptNo,String state);
public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities);
}
src/main/java/com/yxproject/start/service/SelectSerialNumberService.java
View file @ e5645b65
package com.yxproject.start.service;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.entity.resp.*;
public interface SelectSerialNumberService {
SelectByGroupNumEntity selectByGroupNumberFromYX(String id);
SelectByGroupNumEntity selectByGroupNumberFromACC(String id);
SelectByAcceptedEntity selectByAccepted(String id);
SelectByIdcardEntity selectByIdCard(String id);
SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
/*根据任务单查询辅助库*/
SelectFromTaskListEntity selectByWorkOrderFromYX(String id);
/*根据受理号查询*/
SelectFromTaskListEntity selectByAcceptFromYX(String id);
SelectFromAccEntity selectByAcceptFromAcc(String id);
SelectFromProdEntity selectByAcceptFromProd(String id);
/*根据组号查询*/
SelectFromTaskListEntity selectByGroupNoFromYX(String id);
SelectFromProdEntity selectByGroupNoFromProd(String id);
SelectFromAccEntity selectByGroupNoFromAcc(String id);
/*根据身份证号查询*/
SelectFromTaskListEntity selectByCardIdFromYX(String id);
SelectFromAccEntity selectByCardIdFromAcc(String id);
SelectFromProdEntity selectByCardIdFromProd(String id);
}
src/main/java/com/yxproject/start/service/impl/CardDetailedListServiceImpl.java
View file @ e5645b65
......@@ -18,8 +18,8 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
private CardDetailedListMapper cardDetailedListMapper;
@Override
public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId) {
List<CardDetailedListEntity> list = cardDetailedListMapper.selectCardDetiledListData(taskId,gajgId);
public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId) {
List<CardDetailedListEntity> list = cardDetailedListMapper.selectCardDetailedListData(taskId,gajgId);
return list;
}
......
src/main/java/com/yxproject/start/service/impl/NewFilesServiceImpl.java 0 → 100644
View file @ e5645b65
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.NewFilesEntity;
import com.yxproject.start.mapper.NewFilesMapper;
import com.yxproject.start.service.NewFilesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @auther zhangyusheng
* 2019/3/4 18:52
*/
@Service
public class NewFilesServiceImpl implements NewFilesService {
@Autowired
private NewFilesMapper newFilesMapper;
@Override
public long saveNewFiles(NewFilesEntity newFilesEntity) {
return newFilesMapper.saveNewFiles(newFilesEntity);
}
@Override
public boolean updateNewFileName(NewFilesEntity newFilesEntity) {
return newFilesMapper.updateNewFileName(newFilesEntity);
}
}
src/main/java/com/yxproject/start/service/impl/PreproPersonServiceImpl.java
View file @ e5645b65
......@@ -24,7 +24,29 @@ public class PreproPersonServiceImpl implements PreproPersonService {
}
@Override
public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate));
return preproPersonEntities;
}
private String replace(String str){
if ("".equals(str)){
return null;
}else {
return str;
}
}
/**
* 更新制证信息表中新文件名
* @param preproPersonEntities
* @return
*/
@Override
public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities) {
for (PreproPersonEntity preproPersonEntity: preproPersonEntities) {
preproPersonMapper.updateNewFileName(preproPersonEntity);
}
return true;
}
}
src/main/java/com/yxproject/start/service/impl/SelectSerialNumberServiceImpl.java
View file @ e5645b65
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.entity.resp.*;
import com.yxproject.start.mapper.SelectSerialNumberMapper;
import com.yxproject.start.service.SelectSerialNumberService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -20,144 +17,56 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService
public SelectSerialNumberMapper selectSerialNumberMapper;
@Override
public SelectByGroupNumEntity selectByGroupNumberFromYX(String id){
Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
try {
selectByGroupNumEntity.setLibrary("盈信库");
selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
}catch (NullPointerException e){
e.printStackTrace();
}
return selectByGroupNumEntity;
public SelectFromTaskListEntity selectByWorkOrderFromYX(String id) {
return null;
}
@Override
public SelectByGroupNumEntity selectByGroupNumberFromACC(String id){
Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
try {
selectByGroupNumEntity.setLibrary("受理库");
selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
}catch (NullPointerException e){
e.printStackTrace();
}
return selectByGroupNumEntity;
public SelectFromTaskListEntity selectByAcceptFromYX(String id) {
return null;
}
@Override
public SelectFromAccEntity selectByAcceptFromAcc(String id) {
return null;
}
@Override
public SelectFromProdEntity selectByAcceptFromProd(String id) {
return null;
}
@Override
public SelectByAcceptedEntity selectByAccepted(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
String sex ;
try {
if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
sex = "男";
}else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
sex = "女";
}else {
sex = "缺失";
}
selectByAcceptedEntity.setCardType((String) map.get("CARD_TYPE"));
selectByAcceptedEntity.setLibrary("受理库");
selectByAcceptedEntity.setAccept_No((String) map.get("ACCEPT_NO"));
selectByAcceptedEntity.setName((String) map.get("NAME"));
selectByAcceptedEntity.setSex_No(sex);
selectByAcceptedEntity.setId_No((String) map.get("ID_NO"));
selectByAcceptedEntity.setBirthday((String) map.get("BIRTHDAY"));
selectByAcceptedEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
selectByAcceptedEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
selectByAcceptedEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
selectByAcceptedEntity.setStatus_No((String) map.get("STATUS_NO"));
selectByAcceptedEntity.setTaskState((String) map.get("TASK_STATE"));
selectByAcceptedEntity.setCityName((String) map.get("CITYNAME"));
selectByAcceptedEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
}catch (NullPointerException e){
e.printStackTrace();
}
return selectByAcceptedEntity;
public SelectFromTaskListEntity selectByGroupNoFromYX(String id) {
return null;
}
@Override
public SelectFromProdEntity selectByGroupNoFromProd(String id) {
return null;
}
@Override
public SelectFromAccEntity selectByGroupNoFromAcc(String id) {
return null;
}
@Override
public SelectFromTaskListEntity selectByCardIdFromYX(String id) {
return null;
}
@Override
public SelectByIdcardEntity selectByIdCard(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByIdCard(id);
SelectByIdcardEntity selectByIdcardEntity = new SelectByIdcardEntity();
String sex ;
try {
if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
sex = "男";
}else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
sex = "女";
}else {
sex = "缺失";
}
selectByIdcardEntity.setCardType((String) map.get("CARD_TYPE"));
selectByIdcardEntity.setLibrary("受理库");
selectByIdcardEntity.setAccept_No((String) map.get("ACCEPT_NO"));
selectByIdcardEntity.setName((String) map.get("NAME"));
selectByIdcardEntity.setSex_No(sex);
selectByIdcardEntity.setId_No((String) map.get("ID_NO"));
selectByIdcardEntity.setBirthday((String) map.get("BIRTHDAY"));
selectByIdcardEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
selectByIdcardEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
selectByIdcardEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
selectByIdcardEntity.setStatus_No((String) map.get("STATUS_NO"));
selectByIdcardEntity.setTaskState((String) map.get("TASK_STATE"));
selectByIdcardEntity.setCityName((String) map.get("CITYNAME"));
selectByIdcardEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
}catch (NullPointerException e){
e.printStackTrace();
}
return selectByIdcardEntity;
public SelectFromAccEntity selectByCardIdFromAcc(String id) {
return null;
}
@Override
public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
SelectByWorkOrderEntity selectByWorkOrderEntity = new SelectByWorkOrderEntity();
try {
selectByWorkOrderEntity.setLibrary("盈信库");
selectByWorkOrderEntity.setCityName((String) map.get("CITYNAME"));
selectByWorkOrderEntity.setCardType((String) map.get("CARD_TYPE"));
selectByWorkOrderEntity.setPainterName((String) map.get("PRINTER_NAME"));
selectByWorkOrderEntity.setTask_Id(Long.valueOf(String.valueOf( map.get("TASK_ID"))));
selectByWorkOrderEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
selectByWorkOrderEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
selectByWorkOrderEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
selectByWorkOrderEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
selectByWorkOrderEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
selectByWorkOrderEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
} catch (NullPointerException e){
e.printStackTrace();
}
return selectByWorkOrderEntity;
public SelectFromProdEntity selectByCardIdFromProd(String id) {
return null;
}
}
src/main/java/com/yxproject/start/utils/ExportXml.java deleted 100644 → 0
View file @ 604096b5
package com.yxproject.start.utils;
import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import java.io.IOException;
import java.util.List;
/**
* @auther zhangyusheng
* 2019/2/13 16:05
*/
public class ExportXml {
/**
* 生成单个可制证数据XML
*
* @throws IOException 可能出现文件写入不成功
*/
public static void createToMakePackageXML(List<PreproPersonEntity> preproPersonEntities , FilesEntity filesEntity, String url) throws IOException {
//todo
Document document = DocumentHelper.createDocument();
Element PACKAGE = DocumentHelper.createElement("PACKAGE");
document.setRootElement(PACKAGE);
Element PACKAGEHEAD = PACKAGE.addElement("PACKAGEHEAD");
Element DATA = PACKAGE.addElement("DATA");
Element DWDM = PACKAGEHEAD.addElement("DWDM");
DWDM.setText(filesEntity.getDwdm());
Element DWMC = PACKAGEHEAD.addElement("DWMC");
DWMC.setText(filesEntity.getDwmc());
Element JLS = PACKAGEHEAD.addElement("JLS");
JLS.setText(preproPersonEntities.size()+"");
int NO=1;
for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
Element RECORD = DATA.addElement("RECORD");
RECORD.addAttribute("no", NO+"");
RECORD.addAttribute("sid", preproPersonEntity.getSid());
Element JMSFZSLH = RECORD.addElement("JMSFZSLH");
JMSFZSLH.setText(preproPersonEntity.getJmsfzslh());
Element GMSFHM = RECORD.addElement("GMSFHM");
GMSFHM.setText(preproPersonEntity.getGmsfhm());
Element XM = RECORD.addElement("XM");
XM.setText(replaceNullString(preproPersonEntity.getXm()));
Element XBDM = RECORD.addElement("XBDM");
XBDM.setText(replaceNullString(preproPersonEntity.getXbdm()));
Element MZDM = RECORD.addElement("MZDM");
MZDM.setText(replaceNullString(preproPersonEntity.getMzdm()));
Element CSRQ = RECORD.addElement("CSRQ");
CSRQ.setText(replaceNullString(preproPersonEntity.getCsrq()));
Element SSXQDM = RECORD.addElement("SSXQDM");
SSXQDM.setText(replaceNullString(preproPersonEntity.getSsxqdm()));
Element DZMC = RECORD.addElement("DZMC");
DZMC.setText(replaceNullString(preproPersonEntity.getDzmc()));
Element SDXP = RECORD.addElement("SDXP");
SDXP.setText(replaceNullString(preproPersonEntity.getSdxp()));
Element ZWY_ZWTXSJ = RECORD.addElement("ZWY_ZWTXSJ");
ZWY_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtxsj()));
Element ZWY_ZWTZSJ = RECORD.addElement("ZWY_ZWTZSJ");
ZWY_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtzsj()));
Element ZWE_ZWTXSJ = RECORD.addElement("ZWE_ZWTXSJ");
ZWE_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZweZwtxsj()));
Element ZWE_ZWTZSJ = RECORD.addElement("ZWE_ZWTZSJ");
ZWE_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZweZwtzsj()));
Element QFJG_GAJGMC = RECORD.addElement("QFJG_GAJGMC");
QFJG_GAJGMC.setText(replaceNullString(preproPersonEntity.getQfjgGajgmc()));
Element YXQQSRQ = RECORD.addElement("YXQQSRQ");
YXQQSRQ.setText(preproPersonEntity.getYxqqsrq());
Element YXQJZRQ = RECORD.addElement("YXQJZRQ");
YXQJZRQ.setText(preproPersonEntity.getYxqjzrq());
Element JMSFZSLYYDM = RECORD.addElement("JMSFZSLYYDM");
JMSFZSLYYDM.setText(preproPersonEntity.getJmsfzslyydm());
Element JMSFZZZLXDM = RECORD.addElement("JMSFZZZLXDM");
JMSFZZZLXDM.setText(preproPersonEntity.getJmsfzzzlxdm());
Element JMSFZLZFSDM = RECORD.addElement("JMSFZLZFSDM");
JMSFZLZFSDM.setText(preproPersonEntity.getJmsfzlzfsdm());
Element SJR_XM = RECORD.addElement("SJR_XM");
SJR_XM.setText(replaceNullString(preproPersonEntity.getSjrXm()));
Element SJR_LXDH = RECORD.addElement("SJR_LXDH");
SJR_LXDH.setText(replaceNullString(preproPersonEntity.getSjrLxdh()));
Element SJR_YZBM = RECORD.addElement("SJR_YZBM");
SJR_YZBM.setText(replaceNullString(preproPersonEntity.getSjrYzbm()));
Element SJR_TXDZ = RECORD.addElement("SJR_TXDZ");
SJR_TXDZ.setText(replaceNullString(preproPersonEntity.getSjrTxdz()));
NO++;
}
YXStringUtils.saveDom2File(document, url + "\\" + "ZAGL_ZZJH_" + ".xml");
}
/**
* 字符串去除空格
* @param str 原始字符串
* @return 返回新的字符串
*/
public static String replaceNullString(String str) {
if (str == null) return "";
else return str;
}
}
src/main/java/com/yxproject/start/utils/IDCardXmlUtils.java deleted 100644 → 0
View file @ 604096b5
//package com.yxproject.start.utils;
//
//
//import com.yingxin.framework.config.YXServerConfig;
//import com.yingxin.framework.utils.SpringBeanUtil;
//import com.yingxin.framework.utils.YXStringUtils;
//import com.yingxin.hibernate.domain.NewPackageInfoEntity;
//import com.yingxin.hibernate.domain.ProductionEntity;
//import com.yingxin.hibernate.domain.SpecialpackageEntity;
//import com.yingxin.hibernate.service.Manager;
//import org.dom4j.*;
//
//import java.io.*;
//import java.text.SimpleDateFormat;
//import java.util.*;
//
//public class IDCardXmlUtils {
// static Manager manager = (Manager) SpringBeanUtil.getContext().getBean("manager");
//
// /**
// * 生成单个可制证数据XML
// *
// * @throws IOException 可能出现文件写入不成功
// */
// public static void createToMakePackageXML(Map<String, Object> map ,String url) throws IOException {
// Map<String, Object> packageMap = (Map<String, Object>) map.get("package");
// List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
// Document document = DocumentHelper.createDocument();
// Element PACKAGE = DocumentHelper.createElement("PACKAGE");
// document.setRootElement(PACKAGE);
// Element PACKAGEHEAD = PACKAGE.addElement("PACKAGEHEAD");
// Element DATA = PACKAGE.addElement("DATA");
//
// Element BBH = PACKAGEHEAD.addElement("BBH");
// BBH.setText(((String) packageMap.get("BBH")));
// Element DWDM = PACKAGEHEAD.addElement("DWDM");
// DWDM.setText(((String) packageMap.get("DWDM")));
// Element DWMC = PACKAGEHEAD.addElement("DWMC");
// DWMC.setText(((String) packageMap.get("DWMC")));
// Element JLS = PACKAGEHEAD.addElement("JLS");
// JLS.setText(packageMap.get("JLS").toString());
// Element SCSJ = PACKAGEHEAD.addElement("SCSJ");
// SCSJ.setText(((String) packageMap.get("SCSJ")));
// Element SJBBH = PACKAGEHEAD.addElement("SJBBH");
// SJBBH.setText(((String) packageMap.get("SJBBH")));
//
//
// NewPackageInfoEntity newPackageInfoEntity = new NewPackageInfoEntity();
// newPackageInfoEntity.setPackagenum(((String) packageMap.get("SJBBH")));
// newPackageInfoEntity.setCreatedata(((String) packageMap.get("SCSJ")));
// newPackageInfoEntity.setCreatename("2222222");
// manager.saveNewPackageNum(newPackageInfoEntity);
// for (Map<String, Object> map1 : list) {
// Element RECORD = DATA.addElement("RECORD");
// RECORD.addAttribute("no", map1.get("no") + "");
// RECORD.addAttribute("sid", ((String) map1.get("sid")).replaceAll(" ", ""));
// Element JMSFZSLH = RECORD.addElement("JMSFZSLH");
// JMSFZSLH.setText(((String) map1.get("JMSFZSLH")));
// Element GMSFHM = RECORD.addElement("GMSFHM");
// GMSFHM.setText(((String) map1.get("GMSFHM")));
// Element XM = RECORD.addElement("XM");
// XM.setText(replaceNullString((String) map1.get("XM")));
// Element XBDM = RECORD.addElement("XBDM");
// XBDM.setText(replaceNullString((String) map1.get("XBDM")));
// Element MZDM = RECORD.addElement("MZDM");
// MZDM.setText(replaceNullString((String) map1.get("MZDM")));
// Element CSRQ = RECORD.addElement("CSRQ");
// CSRQ.setText(replaceNullString((String) map1.get("CSRQ")));
// Element SSXQDM = RECORD.addElement("SSXQDM");
// SSXQDM.setText(replaceNullString((String) map1.get("SSXQDM")));
// Element DZMC = RECORD.addElement("DZMC");
// DZMC.setText(replaceNullString((String) map1.get("DZMC")));
// Element SDXP = RECORD.addElement("SDXP");
// SDXP.setText(replaceNullString((String) map1.get("SDXP")));
// Element ZWY_ZWTXSJ = RECORD.addElement("ZWY_ZWTXSJ");
// ZWY_ZWTXSJ.setText(replaceNullString((String) map1.get("ZWY_ZWTXSJ")));
// Element ZWY_ZWTZSJ = RECORD.addElement("ZWY_ZWTZSJ");
// ZWY_ZWTZSJ.setText(replaceNullString((String) map1.get("ZWY_ZWTZSJ")));
// Element ZWE_ZWTXSJ = RECORD.addElement("ZWE_ZWTXSJ");
// ZWE_ZWTXSJ.setText(replaceNullString((String) map1.get("ZWE_ZWTXSJ")));
// Element ZWE_ZWTZSJ = RECORD.addElement("ZWE_ZWTZSJ");
// ZWE_ZWTZSJ.setText(replaceNullString((String) map1.get("ZWE_ZWTZSJ")));
// Element QFJG_GAJGMC = RECORD.addElement("QFJG_GAJGMC");
// QFJG_GAJGMC.setText(replaceNullString((String) map1.get("QFJG_GAJGMC")));
// Element YXQQSRQ = RECORD.addElement("YXQQSRQ");
// YXQQSRQ.setText(replaceNullString((String) map1.get("YXQQSRQ")));
// Element YXQJZRQ = RECORD.addElement("YXQJZRQ");
// YXQJZRQ.setText(replaceNullString((String) map1.get("YXQJZRQ")).replaceAll(" ",""));
// Element JMSFZSLYYDM = RECORD.addElement("JMSFZSLYYDM");
// JMSFZSLYYDM.setText(replaceNullString((String) map1.get("JMSFZSLYYDM")));
// Element JMSFZZZLXDM = RECORD.addElement("JMSFZZZLXDM");
// JMSFZZZLXDM.setText(replaceNullString((String) map1.get("JMSFZZZLXDM")));
// Element JMSFZLZFSDM = RECORD.addElement("JMSFZLZFSDM");
// JMSFZLZFSDM.setText(replaceNullString((String) map1.get("JMSFZLZFSDM")));
// Element SJR_XM = RECORD.addElement("SJR_XM");
// SJR_XM.setText(replaceNullString((String) map1.get("SJR_XM")));
// Element SJR_LXDH = RECORD.addElement("SJR_LXDH");
// SJR_LXDH.setText(replaceNullString((String) map1.get("SJR_LXDH")));
// Element SJR_YZBM = RECORD.addElement("SJR_YZBM");
// SJR_YZBM.setText(replaceNullString((String) map1.get("SJR_YZBM")));
// Element SJR_TXDZ = RECORD.addElement("SJR_TXDZ");
// SJR_TXDZ.setText(replaceNullString((String) map1.get("SJR_TXDZ")));
// }
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
//
// YXStringUtils.saveDom2File(document, url + "\\" + "ZAGL_ZZJH_" + packageMap.get("SJBBH") + ".xml");
//
// }
//
//
// /**
// * 生成单个可制证军人证数据XML
// *
// * @throws IOException 可能出现文件写入不成功
// */
// public static void createToMakePackageSoldierXML(Map<String, Object> map,String url) throws IOException {
// Map<String, Object> packageMap = (Map<String, Object>) map.get("package");
// List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("list");
// Document document = DocumentHelper.createDocument();
// Element PACKAGE = DocumentHelper.createElement("Package");
// document.setRootElement(PACKAGE);
// Element PACKAGEHEAD = PACKAGE.addElement("PackageHead");
// Element DATA = PACKAGE.addElement("Data");
// Element BBH = PACKAGEHEAD.addElement("BBH");
// BBH.setText(((String) packageMap.get("BBH")));
// Element SJBBH = PACKAGEHEAD.addElement("SJBBH");
// SJBBH.setText(((String) packageMap.get("SJBBH")));
// Element SJBLX = PACKAGEHEAD.addElement("SJBLX");
// SJBLX.setText("63");
// Element DWDM = PACKAGEHEAD.addElement("DWDM");
// DWDM.setText(((String) packageMap.get("DWDM")));
// Element DWMC = PACKAGEHEAD.addElement("DWMC");
// DWMC.setText(((String) packageMap.get("DWMC")));
// Element SCSJ = PACKAGEHEAD.addElement("FSSJ");
// SCSJ.setText(((String) packageMap.get("SCSJ")));
// Element JLS = PACKAGEHEAD.addElement("JLS");
// JLS.setText(packageMap.get("JLS").toString());
// NewPackageInfoEntity newPackageInfoEntity = new NewPackageInfoEntity();
// newPackageInfoEntity.setPackagenum(((String) packageMap.get("SJBBH")));
// newPackageInfoEntity.setCreatedata(((String) packageMap.get("SCSJ")));
// newPackageInfoEntity.setCreatename("2222222");
// manager.saveNewPackageNum(newPackageInfoEntity);
// for (Map<String, Object> map1 : list) {
// Element RECORD = DATA.addElement("Record");
// Element JMSFZSLH = RECORD.addElement("CzrkSlh");
// JMSFZSLH.setText(((String) map1.get("JMSFZSLH")));
// Element GMSFHM = RECORD.addElement("CzrkGmsfhm");
// GMSFHM.setText(((String) map1.get("GMSFHM")));
// Element XM = RECORD.addElement("CzrkXm");
// XM.setText(replaceNullString((String) map1.get("XM")));
// Element XBDM = RECORD.addElement("CzrkXb");
// XBDM.setText(replaceNullString((String) map1.get("XBDM")));
// Element CSRQ = RECORD.addElement("CzrkCsrq");
// CSRQ.setText(replaceNullString((String) map1.get("CSRQ")));
// Element MZDM = RECORD.addElement("CzrkMz");
// MZDM.setText(replaceNullString((String) map1.get("MZDM")));
// Element SSXQDM = RECORD.addElement("CzrkSsqx");
// SSXQDM.setText(replaceNullString((String) map1.get("SSXQDM")));
// Element DZMC = RECORD.addElement("CzrkZz");
// DZMC.setText(replaceNullString((String) map1.get("DZMC")));
// Element QFJG_GAJGMC = RECORD.addElement("CzrkQfjg");
// QFJG_GAJGMC.setText(replaceNullString((String) map1.get("QFJG_GAJGMC")));
// Element YXQQSRQ = RECORD.addElement("CzrkYxqxqsrq");
// YXQQSRQ.setText(replaceNullString((String) map1.get("YXQQSRQ")));
// Element YXQJZRQ = RECORD.addElement("CzrkYxqxjzrq");
// YXQJZRQ.setText(replaceNullString((String) map1.get("YXQJZRQ")));
// Element JMSFZSLYYDM = RECORD.addElement("CzrkSlyy");
// JMSFZSLYYDM.setText(replaceNullString((String) map1.get("JMSFZSLYYDM")));
// Element JMSFZZZLXDM = RECORD.addElement("CzrkZzlx");
// JMSFZZZLXDM.setText(replaceNullString((String) map1.get("JMSFZZZLXDM")));
// Element JMSFZLZFSDM = RECORD.addElement("CzrkLzfs");
// JMSFZLZFSDM.setText(replaceNullString((String) map1.get("JMSFZLZFSDM")));
// Element SJR_XM = RECORD.addElement("CzrkSjrxm");
// SJR_XM.setText(replaceNullString((String) map1.get("SJR_XM")));
// Element SJR_LXDH = RECORD.addElement("CzrkSjrlxdh");
// SJR_LXDH.setText(replaceNullString((String) map1.get("SJR_LXDH")));
// Element SJR_YZBM = RECORD.addElement("CzrkSjryb");
// SJR_YZBM.setText(replaceNullString((String) map1.get("SJR_YZBM")));
// Element SJR_TXDZ = RECORD.addElement("CzrkSjrtxdz");
// SJR_TXDZ.setText(replaceNullString((String) map1.get("SJR_TXDZ")));
// Element SDXP = RECORD.addElement("CzrkSdzp");
// SDXP.setText(replaceNullString((String) map1.get("SDXP")));
//
// }
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
// YXStringUtils.saveDom2File(document, url + "\\" + "TEST_SOLDIER_" + packageMap.get("SJBBH") + ".xml");
//
// }
//
//
// /**
// * 生成单个质量回馈数据XML
// *
// * @param list 质量回馈数据
// * @param idx 数据包编号
// * @throws IOException
// */
// public static void createToBackPackageXML(List<ProductionEntity> list, int idx) throws IOException {
//
// Document document = DocumentHelper.createDocument();
// Element PACKAGE = DocumentHelper.createElement("PACKAGE");
// document.setRootElement(PACKAGE);
//
// Element PACKAGEHEAD = PACKAGE.addElement("PACKAGEHEAD");
// Element DATA = PACKAGE.addElement("DATA");
//
// Element BBH = PACKAGEHEAD.addElement("BBH");
// BBH.setText("3.00");
// Element DWDM = PACKAGEHEAD.addElement("DWDM");
// DWDM.setText("410000000000");
// Element DWMC = PACKAGEHEAD.addElement("DWMC");
// DWMC.setText("河南省公安厅1");
// Element JLS = PACKAGEHEAD.addElement("JLS");
// JLS.setText(String.valueOf(list.size()));
//
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
//
// String zero = "00000";
// int len = String.valueOf(idx).length();
// String pkgNumber = "410000000000" + date + zero.substring(0, zero.length() - len) + String.valueOf(idx + 1);
// Element SCSJ = PACKAGEHEAD.addElement("SCSJ");
// SCSJ.setText(date);
// Element SJBBH = PACKAGEHEAD.addElement("SJBBH");
// SJBBH.setText(pkgNumber);
// for (int j = 0; j < list.size(); j++) {
//
// ProductionEntity production = list.get(j);
// Element RECORD = DATA.addElement("RECORD");
// RECORD.addAttribute("no", String.valueOf(j + 1));
// RECORD.addAttribute("sid", production.getSid().replaceAll(" ", ""));
// Element JMSFZSLH = RECORD.addElement("JMSFZSLH");
// JMSFZSLH.setText(replaceNullString(production.getJmsfzslh()));
// Element GMSFHM = RECORD.addElement("GMSFHM");
// GMSFHM.setText(replaceNullString(production.getGmsfhm()));
// Element XM = RECORD.addElement("XM");
// XM.setText(replaceNullString(production.getXm()));
// Element JMSFZZZXXCWLBDM = RECORD.addElement("JMSFZZZXXCWLBDM");
// JMSFZZZXXCWLBDM.setText(replaceNullString(production.getYxZpzlfk()));
// Element CWMS_JYQK = RECORD.addElement("CWMS_JYQK");
// CWMS_JYQK.setText("相片不合格");
// Element JYDW_GAJGJGDM = RECORD.addElement("JYDW_GAJGJGDM");
// JYDW_GAJGJGDM.setText("410000000000");
// Element JYDW_GAJGMC = RECORD.addElement("JYDW_GAJGMC");
// JYDW_GAJGMC.setText("河南省公安厅1");
// Element JYR_XM = RECORD.addElement("JYR_XM");
// JYR_XM.setText("yy");
// Element JYRQ = RECORD.addElement("JYRQ");
// JYRQ.setText(date);
//
//
// production.setYxLczt(-4);
// production.setNewpackagenum(pkgNumber);
// manager.updataSpecialpackageByProductionEntity(production);
//
// }
// String url = YXServerConfig.FILE_TEMP_FOLDER + "/" + date;
// YXStringUtils.saveDom2File(document, url + "\\" + "TEST_BACK_" + pkgNumber + ".xml");
//
// }
//
// /**
// * 循环生成数量为80的数组
// *
// * @param list 原始数组数据
// * @return
// */
// public static List<List<ProductionEntity>> splitPackage(List<ProductionEntity> list) {
//
// int packageNum = list.size() / 80 + (((list.size() % 80 > 0) ? 1 : 0));
//
// List<List<ProductionEntity>> ls = new ArrayList();
// for (int i = 0; i < packageNum; i++) {
// List<ProductionEntity> l = new ArrayList();
// for (int j = 80 * i; j < 80 * i + 80; j++) {
// if (j < list.size()) {
// l.add(list.get(j));
// } else {
// break;
// }
// }
// ls.add(l);
// }
//
// return ls;
// }
//
//
// /**
// * 生成单个可制证的XML
// *
// * @param list
// * @param specialpackage
// * @return
// * @throws IOException
// */
// public static File createToMakeXml(List<ProductionEntity> list, SpecialpackageEntity specialpackage) throws IOException {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
// String url = YXServerConfig.FILE_TEMP_FOLDER + "/" + date;
// File file = new File(url);
// if (!file.exists()) {
// file.mkdirs();
// }
// List<List<ProductionEntity>> pkgarr = splitPackage(list);
// for (int i = 0; i < pkgarr.size(); i++) {
// List<ProductionEntity> pl = pkgarr.get(i);
// if (pl.get(0).getSjblx() != null) {
// createToMakePackageSoldierXML(createToMakeMap(pl, specialpackage, i),url);
// } else {
// createToMakePackageXML(createToMakeMap(pl, specialpackage, i),url);
// }
// }
// return null;
// }
//
// /**
// * 重新生成单个可制证的XML
// *
// * @param list
// * @param specialpackage
// * @return
// * @throws IOException
// */
// public static File createToMakeXmlAgain(List<ProductionEntity> list, SpecialpackageEntity specialpackage) throws IOException {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
// String url = YXServerConfig.FILE_AGAIN_FOLDER + "/" + date;
// File file = new File(url);
// if (!file.exists()) {
// file.mkdirs();
// }
// List<List<ProductionEntity>> pkgarr = splitPackage(list);
// for (int i = 0; i < pkgarr.size(); i++) {
// List<ProductionEntity> pl = pkgarr.get(i);
// if (pl.get(0).getSjblx() != null) {
// createToMakePackageSoldierXML(createToMakeMap(pl, specialpackage, i),url);
// } else {
// createToMakePackageXML(createToMakeMap(pl, specialpackage, i),url);
// }
// }
// return null;
// }
//
//
// public static Map<String, Object> createToMakeMap(List<ProductionEntity> list, SpecialpackageEntity specialpackageEntity, int idex) {
// Map<String, Object> map = new HashMap<String, Object>();
// Map<String, Object> packageMap = new HashMap<String, Object>();
// packageMap.put("BBH", specialpackageEntity.getBbh());
// packageMap.put("DWDM", specialpackageEntity.getDwdm());
// packageMap.put("DWMC", specialpackageEntity.getDwmc());
// packageMap.put("JLS", list.size());
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
// String zero = "0000";
// int len = String.valueOf(idex).length();
// String pkgNumber = specialpackageEntity.getSjbbh().substring(0, 12) + date + specialpackageEntity.getSjbbh().substring(specialpackageEntity.getSjbbh().length() - 5, specialpackageEntity.getSjbbh().length() - 4) + zero.substring(0, zero.length() - len) + String.valueOf(idex + 1);
// SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
// String date1 = simpleDateFormat1.format(new Date());
// packageMap.put("SCSJ", date1);
// packageMap.put("SJBBH", pkgNumber);
// if (list.get(0).getSjblx() != null) {
// packageMap.put("SJBLX", list.get(0).getSjblx());
// }
// List<Map<String, Object>> personList = new ArrayList<Map<String, Object>>();
// for (int j = 0; j < list.size(); j++) {
// Map<String, Object> personMap = new HashMap<String, Object>();
// if (list.get(j).getSid() != null) {
// personMap.put("sid", list.get(j).getSid());
// personMap.put("no", j + 1);
// }
// personMap.put("JMSFZSLH", list.get(j).getJmsfzslh());
// personMap.put("GMSFHM", list.get(j).getGmsfhm());
// personMap.put("XM", list.get(j).getXm());
// personMap.put("XBDM", list.get(j).getXbdm());
// personMap.put("MZDM", list.get(j).getMzdm());
// personMap.put("CSRQ", list.get(j).getCsrq());
// personMap.put("SSXQDM", list.get(j).getSsxqdm());
// personMap.put("DZMC", list.get(j).getDzmc());
// personMap.put("SDXP", list.get(j).getSdxp());
// personMap.put("ZWY_ZWTXSJ", list.get(j).getZwyZwtxsj());
// personMap.put("ZWY_ZWTZSJ", list.get(j).getZwyZwtzsj());
// personMap.put("ZWE_ZWTXSJ", list.get(j).getZweZwtxsj());
// personMap.put("ZWE_ZWTZSJ", list.get(j).getZweZwtzsj());
// personMap.put("QFJG_GAJGMC", list.get(j).getQfjgGajgmc());
// personMap.put("YXQQSRQ", list.get(j).getYxqqsrq());
// personMap.put("YXQJZRQ", list.get(j).getYxqjzrq());
// personMap.put("JMSFZSLYYDM", list.get(j).getJmsfzslyydm());
// personMap.put("JMSFZZZLXDM", list.get(j).getJmsfzzzlxdm());
// personMap.put("JMSFZLZFSDM", list.get(j).getJmsfzlzfsdm());
// personMap.put("SJR_XM", list.get(j).getSjrXm());
// personMap.put("SJR_LXDH", list.get(j).getSjrLxdh());
// personMap.put("SJR_YZBM", list.get(j).getSjrYzbm());
// personMap.put("SJR_TXDZ", list.get(j).getSjrTxdz());
// personList.add(personMap);
// ProductionEntity production = list.get(j);
// production.setYxLczt(8);
// production.setNewpackagenum(pkgNumber);
// manager.updataSpecialpackageByProductionEntity(production);
// }
// map.put("list", personList);
// map.put("package", packageMap);
//
// return map;
// }
//
// /**
// * 生成质量回馈数据XML
// *
// * @param list 原始数据
// * @return
// * @throws IOException
// */
// public static File creakeToBackXML(List<ProductionEntity> list, int num) throws IOException {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// String date = simpleDateFormat.format(new Date());
// String url = YXServerConfig.FILE_TEMP_FOLDER + "/" + date;
// File file = new File(url);
// if (!file.exists()) {
// file.mkdirs();
// }
// createToBackPackageXML(list, num);
// return null;
// }
//
// /**
// * 字符串去除空格
// *
// * @param str 原始字符串
// * @return 返回新的字符串
// */
// public static String replaceNullString(String str) {
// if (str == null) return "";
// else return str;
// }
//
//
//}
src/main/java/com/yxproject/start/utils/QuerySequenceSercive.java
View file @ e5645b65
......@@ -13,8 +13,8 @@ public class QuerySequenceSercive {
@Autowired
private QuerySequenceMapper querySequenceMapper;
public String selectSequenceNextValue(String sequenceName){
String s = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval()");
return s;
Object[] objects = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
return "";
}
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ e5645b65
......@@ -5,5 +5,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<configuration>
<settings>
<setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="logImpl" value="STDOUT_LOGGING" />
</settings>
</configuration>
\ No newline at end of file
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