Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 900180b0 authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents 47b12f64 16c2f519
Hide whitespace changes
Inline Side-by-side
Showing with 1513 additions and 1211 deletions
src/main/java/com/yxproject/start/api/AdminApi.java
View file @ 900180b0
...@@ -237,7 +237,6 @@ public class AdminApi { ...@@ -237,7 +237,6 @@ public class AdminApi {
String str = "0"; String str = "0";
SysPermission sysPermission = new SysPermission(); SysPermission sysPermission = new SysPermission();
sysPermission.setName(jsonObject.getString("name")); sysPermission.setName(jsonObject.getString("name"));
sysPermission.setResource_type(jsonObject.getString("resourceType"));
sysPermission.setUrl(jsonObject.getString("url")); sysPermission.setUrl(jsonObject.getString("url"));
sysPermission.setPermission(jsonObject.getString("permission")); sysPermission.setPermission(jsonObject.getString("permission"));
// sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId"))); // sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
...@@ -335,6 +334,7 @@ public class AdminApi { ...@@ -335,6 +334,7 @@ public class AdminApi {
SysRole sysRole = new SysRole(); SysRole sysRole = new SysRole();
sysRole.setRole(jsonObject.getString("role")); sysRole.setRole(jsonObject.getString("role"));
sysRole.setDescription(jsonObject.getString("description")); sysRole.setDescription(jsonObject.getString("description"));
sysRole.setProcess(Integer.parseInt(jsonObject.getString("process")));
String permissionIds = jsonObject.getString("permissionIds"); String permissionIds = jsonObject.getString("permissionIds");
JSONArray jsonArray = JSONArray.fromObject(permissionIds); JSONArray jsonArray = JSONArray.fromObject(permissionIds);
...@@ -402,19 +402,11 @@ public class AdminApi { ...@@ -402,19 +402,11 @@ public class AdminApi {
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = JSONObject.fromObject(jsonStr);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
boolean flag = false; boolean flag = false;
// String str = "0";
SysPermission sysPermission = new SysPermission(); SysPermission sysPermission = new SysPermission();
sysPermission.setId(Integer.parseInt(jsonObject.getString("id"))); sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
sysPermission.setName(jsonObject.getString("name")); sysPermission.setName(jsonObject.getString("name"));
sysPermission.setResource_type(jsonObject.getString("resourceType"));
sysPermission.setUrl(jsonObject.getString("url")); sysPermission.setUrl(jsonObject.getString("url"));
sysPermission.setPermission(jsonObject.getString("permission")); sysPermission.setPermission(jsonObject.getString("permission"));
// sysPermission.setParent_id(Long.parseLong(parentId));
// if(parentId.equals(str)){
// sysPermission.setParent_ids(parentId+"/");
// }else{
// sysPermission.setParent_ids(str+"/"+parentId);
// }
System.out.println(sysPermission); System.out.println(sysPermission);
flag = sysPermissionService.updatePermission(sysPermission); flag = sysPermissionService.updatePermission(sysPermission);
if (flag) { if (flag) {
...@@ -426,4 +418,4 @@ public class AdminApi { ...@@ -426,4 +418,4 @@ public class AdminApi {
return map; return map;
} }
} }
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 900180b0
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.NewFilesEntity;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.service.NewFilesService;
import com.yxproject.start.service.PreproPersonService; import com.yxproject.start.service.PreproPersonService;
import com.yxproject.start.utils.ExportXml;
import org.apache.commons.lang.time.DateFormatUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.*;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -28,43 +31,171 @@ import java.util.List; ...@@ -28,43 +31,171 @@ import java.util.List;
public class ExportXMLApi { public class ExportXMLApi {
@Autowired @Autowired
private PreproPersonService preproPersonService; private PreproPersonService preproPersonService;
@Autowired
private NewFilesService newFilesService;
/** /**
* 导出制证数据包 * 导出制证数据包
*/ */
@RequestMapping("printXmlData") @RequestMapping("printXmlData")
// @RequiresPermissions("userInfo.add")//权限管理; // @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.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH"); String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件 //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
String fout = null; String fout = null;
List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate); List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
FilesEntity filesEntity = new FilesEntity(); if (preproPersonEntities.size()>0){
filesEntity.setVersionCode("3.00"); FilesEntity filesEntity = new FilesEntity();
filesEntity.setDwdm("410600000000"); filesEntity.setVersionCode("3.00");
filesEntity.setDwmc("北京市公安局"); filesEntity.setDwdm("410600000000");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); filesEntity.setDwmc("北京市公安局");
filesEntity.setCreatTime(simpleDateFormat.format(new Date())); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
try { filesEntity.setCreateTime(simpleDateFormat.format(new Date()));
ExportXml.createToMakePackageXML(preproPersonEntities,filesEntity,"\\zhang"); try {
} catch (IOException e) { fout = createToMakePackageXML(preproPersonEntities, filesEntity, "\\zhang");
e.printStackTrace();
} 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 { try {
FileInputStream fis = new FileInputStream(new File(fout)); FileOutputStream fos = new FileOutputStream("D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+l+ ".xml");
byte[] b = new byte[fis.available()]; OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8");
fis.read(b); OutputFormat of = new OutputFormat();
fis.close(); of.setEncoding("UTF-8");
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xml"); of.setIndent(true);
return b; of.setIndent(" ");
} catch (FileNotFoundException e) { of.setNewlines(true);
e.printStackTrace(); of.setNewLineAfterDeclaration(false);
XMLWriter writer = new XMLWriter(osw, of);
writer.write(document);
writer.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); 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/FilesAnalysisApi.java
View file @ 900180b0
...@@ -13,7 +13,7 @@ public class FilesAnalysisApi { ...@@ -13,7 +13,7 @@ public class FilesAnalysisApi {
private PersonPostService personPostService; private PersonPostService personPostService;
/** /**
* 文件解析 * 文件解析 修改解析状态
* @param fileId * @param fileId
* @param creatTime * @param creatTime
* @return * @return
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 900180b0
...@@ -9,9 +9,11 @@ import com.yxproject.start.utils.YXJSONResponse; ...@@ -9,9 +9,11 @@ import com.yxproject.start.utils.YXJSONResponse;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
...@@ -45,7 +47,7 @@ public class ReadExcelApi { ...@@ -45,7 +47,7 @@ public class ReadExcelApi {
@Consumes(MediaType.MULTIPART_FORM_DATA) @Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) { public boolean ReadPersonPost(@RequestParam("formStartTime") String startDate,@RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) {
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
String filename = ""; String filename = "";
...@@ -92,18 +94,16 @@ public class ReadExcelApi { ...@@ -92,18 +94,16 @@ public class ReadExcelApi {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
// CommonsMultipartFile cf= (CommonsMultipartFile)item;
// DiskFileItem fi = (DiskFileItem)cf.getFileItem();
// File file = fi.getStoreLocation();
ReadExcel readExcel = new ReadExcel(); ReadExcel readExcel = new ReadExcel();
List list1 = readExcel.readExcel(file); List list1 = readExcel.readExcel(file);
//保存EXCEL文件信息 //保存EXCEL文件信息
FileNameDicEntity fileNameDicEntity = new FileNameDicEntity(); FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
fileNameDicEntity.setFileName(filename); fileNameDicEntity.setFileName(filename);
fileNameDicEntity.setUploadDate(new Date()); fileNameDicEntity.setUploadDate(new Date());
fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicEntity.setFormDeadline(replaceDate(endDate));
long l = fileNameDicService.saveFileNameDic(fileNameDicEntity);
//保存个人邮寄信息 //保存个人邮寄信息
// long fileID = fileNameDicService.saveFileNameDic(fileNameDicEntity);
List<PersonPostEntity> entityList = new ArrayList<>(); List<PersonPostEntity> entityList = new ArrayList<>();
for (int i = 0; i < list1.size(); i++) { for (int i = 0; i < list1.size(); i++) {
PersonPostEntity personPostEntity = new PersonPostEntity(); PersonPostEntity personPostEntity = new PersonPostEntity();
...@@ -136,11 +136,10 @@ public class ReadExcelApi { ...@@ -136,11 +136,10 @@ public class ReadExcelApi {
personPostEntity.setNatureOfTheInternal((String) list2.get(21)); personPostEntity.setNatureOfTheInternal((String) list2.get(21));
personPostEntity.setNatureOfTheInformation((String) list2.get(22)); personPostEntity.setNatureOfTheInformation((String) list2.get(22));
personPostEntity.setFirstWhite((String) list2.get(23)); personPostEntity.setFirstWhite((String) list2.get(23));
personPostEntity.setFileId(l);
entityList.add(personPostEntity); entityList.add(personPostEntity);
} }
personPostService.savePersonPost(entityList); personPostService.savePersonPost(entityList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename); yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
...@@ -164,4 +163,43 @@ public class ReadExcelApi { ...@@ -164,4 +163,43 @@ public class ReadExcelApi {
} }
return true; return true;
} }
/**
* 查询个人邮寄解析信息
* @param fileName 文件名称
* @param analysisState 解析状态
* @param currPage 当前页
* @param pageSize 每页数量
* @param resp
* @return
*/
@RequestMapping("queryPersonPost")
public String queryPersonPost(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp) {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(uploadDate,fileName, Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(fileNameDicEntities);
return yxjsonResponse.toJSONString();
}
/**
* 查询个人邮寄解析信息总数量
* @param fileName 文件名称
* @param analysisState 解析状态
* @param resp
* @return
*/
@RequestMapping("queryPersonPostCount")
public String queryPersonPostCount(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, HttpServletResponse resp) {
int i = fileNameDicService.queryFileNameDicCount(uploadDate, fileName, Long.valueOf(analysisState));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i+"");
return yxjsonResponse.toJSONString();
}
private String replaceDate(String str){
return str.replace("-","");
}
} }
\ No newline at end of file
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 900180b0
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.service.ImportXmlService; import com.yxproject.start.service.ImportXmlService;
...@@ -13,6 +14,7 @@ import org.dom4j.DocumentException; ...@@ -13,6 +14,7 @@ import org.dom4j.DocumentException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
...@@ -122,5 +124,38 @@ public class ReadXmlApi { ...@@ -122,5 +124,38 @@ public class ReadXmlApi {
return true; return true;
} }
/**
* 查询XML解析信息
* @param importDate 上传时间
* @param resp
* @return
*/
@RequestMapping("queryPersonXML")
public String queryPersonXMLCount(@RequestParam("importDate") String importDate,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp) {
List<CountDataEntity> countDataEntities = importXmlService.queryPersonXml(replaceDate(importDate),Long.valueOf(currPage)*Long.valueOf(pageSize) ,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countDataEntities);
return yxjsonResponse.toJSONString();
}
/**
* 查询XML解析信息总数量
* @param importDate 上传时间
* @param resp
* @return
*/
@RequestMapping("queryPersonXMLCount")
public String queryPersonXMLCount(@RequestParam("importDate") String importDate, HttpServletResponse resp) {
int i = importXmlService.queryPersonXmlCount(replaceDate(importDate));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i+"");
return yxjsonResponse.toJSONString();
}
private String replaceDate(String str){
return str.replace("-","");
}
} }
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 900180b0
...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity; ...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity;
import com.yxproject.start.entity.TaskList.CountGajgEntity; import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity; import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.service.TaskListService; import com.yxproject.start.service.TaskListService;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -83,4 +85,21 @@ public class TaskListApi { ...@@ -83,4 +85,21 @@ public class TaskListApi {
/**
* 查询任务单详情
* (受理库)
* @param state
* @return
*/
@RequestMapping("queryByCountyAtACCU")
public String queryByCountyAtACCU(@RequestParam("state") String state, HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskListService.selectByCountyAtACCU(state));
return yxjsonResponse.toJSONString();
}
} }
src/main/java/com/yxproject/start/entity/CountDataEntity.java
View file @ 900180b0
...@@ -8,6 +8,7 @@ public class CountDataEntity { ...@@ -8,6 +8,7 @@ public class CountDataEntity {
private Integer cardCount; private Integer cardCount;
private Integer commonCardCount; private Integer commonCardCount;
private Integer postCardCount; private Integer postCardCount;
private long state;
public String getUploadDate() { public String getUploadDate() {
return uploadDate; return uploadDate;
...@@ -48,4 +49,13 @@ public class CountDataEntity { ...@@ -48,4 +49,13 @@ public class CountDataEntity {
public void setPostCardCount(Integer postCardCount) { public void setPostCardCount(Integer postCardCount) {
this.postCardCount = postCardCount; this.postCardCount = postCardCount;
} }
public long getState() {
return state;
}
public void setState(long state) {
this.state = state;
}
} }
src/main/java/com/yxproject/start/entity/FilesEntity.java
View file @ 900180b0
...@@ -12,7 +12,7 @@ public class FilesEntity { ...@@ -12,7 +12,7 @@ public class FilesEntity {
private String dwdm; private String dwdm;
private String dwmc; private String dwmc;
private Long recordNumber; private Long recordNumber;
private String creatTime; private String createTime;
private String sourceFileName; private String sourceFileName;
private Date newTime; private Date newTime;
...@@ -57,13 +57,13 @@ public class FilesEntity { ...@@ -57,13 +57,13 @@ public class FilesEntity {
} }
@Basic @Basic
@Column(name = "CREAT_TIME") @Column(name = "CREATE_TIME")
public String getCreatTime() { public String getCreateTime() {
return creatTime; return createTime;
} }
public void setCreatTime(String creatTime) { public void setCreateTime(String createTime) {
this.creatTime = creatTime; this.createTime = createTime;
} }
@Id @Id
...@@ -95,13 +95,13 @@ public class FilesEntity { ...@@ -95,13 +95,13 @@ public class FilesEntity {
Objects.equals(dwdm, that.dwdm) && Objects.equals(dwdm, that.dwdm) &&
Objects.equals(dwmc, that.dwmc) && Objects.equals(dwmc, that.dwmc) &&
Objects.equals(recordNumber, that.recordNumber) && Objects.equals(recordNumber, that.recordNumber) &&
Objects.equals(creatTime, that.creatTime) && Objects.equals(createTime, that.createTime) &&
Objects.equals(sourceFileName, that.sourceFileName) && Objects.equals(sourceFileName, that.sourceFileName) &&
Objects.equals(newTime, that.newTime); Objects.equals(newTime, that.newTime);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(versionCode, dwdm, dwmc, recordNumber, creatTime, sourceFileName, newTime); return Objects.hash(versionCode, dwdm, dwmc, recordNumber, createTime, sourceFileName, newTime);
} }
} }
src/main/java/com/yxproject/start/entity/NewFilesEntity.java 0 → 100644
View file @ 900180b0
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 @ 900180b0
...@@ -3,6 +3,10 @@ package com.yxproject.start.entity; ...@@ -3,6 +3,10 @@ package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.util.Objects; import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/4 20:09
*/
@Entity @Entity
@Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "") @Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
public class PreproPersonEntity { public class PreproPersonEntity {
...@@ -30,9 +34,9 @@ public class PreproPersonEntity { ...@@ -30,9 +34,9 @@ public class PreproPersonEntity {
private String sjrYzbm; private String sjrYzbm;
private String sjrTxdz; private String sjrTxdz;
private String sid; private String sid;
private String fileName; private Long fileId;
private Long cardTypeId; private Long cardTypeId;
private String newFileName; private Long newFileId;
private Long state; private Long state;
@Id @Id
...@@ -276,13 +280,13 @@ public class PreproPersonEntity { ...@@ -276,13 +280,13 @@ public class PreproPersonEntity {
} }
@Basic @Basic
@Column(name = "FILE_NAME") @Column(name = "FILE_ID")
public String getFileName() { public Long getFileId() {
return fileName; return fileId;
} }
public void setFileName(String fileName) { public void setFileId(Long fileId) {
this.fileName = fileName; this.fileId = fileId;
} }
@Basic @Basic
...@@ -296,13 +300,13 @@ public class PreproPersonEntity { ...@@ -296,13 +300,13 @@ public class PreproPersonEntity {
} }
@Basic @Basic
@Column(name = "NEW_FILE_NAME") @Column(name = "NEW_FILE_ID")
public String getNewFileName() { public Long getNewFileId() {
return newFileName; return newFileId;
} }
public void setNewFileName(String newFileName) { public void setNewFileId(Long newFileId) {
this.newFileName = newFileName; this.newFileId = newFileId;
} }
@Basic @Basic
...@@ -344,14 +348,14 @@ public class PreproPersonEntity { ...@@ -344,14 +348,14 @@ public class PreproPersonEntity {
Objects.equals(sjrYzbm, that.sjrYzbm) && Objects.equals(sjrYzbm, that.sjrYzbm) &&
Objects.equals(sjrTxdz, that.sjrTxdz) && Objects.equals(sjrTxdz, that.sjrTxdz) &&
Objects.equals(sid, that.sid) && Objects.equals(sid, that.sid) &&
Objects.equals(fileName, that.fileName) && Objects.equals(fileId, that.fileId) &&
Objects.equals(cardTypeId, that.cardTypeId) && Objects.equals(cardTypeId, that.cardTypeId) &&
Objects.equals(newFileName, that.newFileName) && Objects.equals(newFileId, that.newFileId) &&
Objects.equals(state, that.state); Objects.equals(state, that.state);
} }
@Override @Override
public int hashCode() { 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/SysPermission.java
View file @ 900180b0
...@@ -5,7 +5,7 @@ import java.io.Serializable; ...@@ -5,7 +5,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author zhangyusheng * @author liboyang
*/ */
@Entity @Entity
@Table(name="SYS_PERMISSION") @Table(name="SYS_PERMISSION")
...@@ -20,10 +20,7 @@ public class SysPermission implements Serializable { ...@@ -20,10 +20,7 @@ public class SysPermission implements Serializable {
* 名称. * 名称.
*/ */
private String name; private String name;
/**
* 资源类型
*/
private String resource_type;
/** /**
* 资源路径. * 资源路径.
*/ */
...@@ -33,19 +30,6 @@ public class SysPermission implements Serializable { ...@@ -33,19 +30,6 @@ public class SysPermission implements Serializable {
*/ */
private String permission; private String permission;
/**
* 父编号
*/
private Long parent_id;
/**
* 父编号列表
*/
private String parent_ids;
private byte available = 0; private byte available = 0;
@ManyToMany @ManyToMany
@JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")}) @JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")})
...@@ -67,22 +51,6 @@ public class SysPermission implements Serializable { ...@@ -67,22 +51,6 @@ public class SysPermission implements Serializable {
this.name = name; this.name = name;
} }
public String getResource_type() {
return resource_type;
}
public void setResource_type(String resource_type) {
this.resource_type = resource_type;
}
public String getParent_ids() {
return parent_ids;
}
public void setParent_ids(String parent_ids) {
this.parent_ids = parent_ids;
}
public String getUrl() { public String getUrl() {
return url; return url;
} }
...@@ -99,16 +67,6 @@ public class SysPermission implements Serializable { ...@@ -99,16 +67,6 @@ public class SysPermission implements Serializable {
this.permission = permission; this.permission = permission;
} }
public Long getParent_id() {
return parent_id;
}
public void setParent_id(Long parent_id) {
this.parent_id = parent_id;
}
public byte getAvailable() { public byte getAvailable() {
return available; return available;
} }
......
src/main/java/com/yxproject/start/entity/SysRole.java
View file @ 900180b0
...@@ -4,7 +4,7 @@ import javax.persistence.*; ...@@ -4,7 +4,7 @@ import javax.persistence.*;
import java.util.List; import java.util.List;
/** /**
* @author zhangyusheng * @author liboyang
*/ */
@Entity @Entity
@Table(name="SYS_ROLE") @Table(name="SYS_ROLE")
...@@ -17,7 +17,7 @@ public class SysRole { ...@@ -17,7 +17,7 @@ public class SysRole {
private Integer id; private Integer id;
/** /**
* 角色标识程序中判断使用,如"admin",这个是唯一的: * 角色标识程序中判断使用,如"admin",这个是唯一的:
*/ */
private String role; private String role;
/** /**
* 角色描述,UI界面显示使用 * 角色描述,UI界面显示使用
...@@ -28,6 +28,8 @@ public class SysRole { ...@@ -28,6 +28,8 @@ public class SysRole {
*/ */
private byte available = 0; private byte available = 0;
private Integer process;
/** /**
* 角色 -- 权限关系：多对多关系; * 角色 -- 权限关系：多对多关系;
*/ */
...@@ -37,13 +39,13 @@ public class SysRole { ...@@ -37,13 +39,13 @@ public class SysRole {
/** /**
* 用户 - 角色关系定义; * 用户 - 角色关系定义;
*/ */
@ManyToMany @ManyToMany
@JoinTable(name="SysUserRole",joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="userId")}) @JoinTable(name="SysUserRole",joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="userId")})
/** /**
* 一个角色对应多个用户 * 一个角色对应多个用户
*/ */
private List<UserInfo> userInfos; private List<UserInfo> userInfos;
...@@ -94,4 +96,12 @@ public class SysRole { ...@@ -94,4 +96,12 @@ public class SysRole {
public void setUserInfos(List<UserInfo> userInfos) { public void setUserInfos(List<UserInfo> userInfos) {
this.userInfos = userInfos; this.userInfos = userInfos;
} }
public Integer getProcess() {
return process;
}
public void setProcess(Integer process) {
this.process = process;
}
} }
\ No newline at end of file
src/main/java/com/yxproject/start/entity/TaskList/CountCountyEntity.java
View file @ 900180b0
package com.yxproject.start.entity.TaskList; package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class CountCountyEntity { public class CountCountyEntity {
private String countyName; private String countyName;
private Integer countyCount; private Integer countyCount;
......
src/main/java/com/yxproject/start/entity/TaskList/CountGajgEntity.java
View file @ 900180b0
package com.yxproject.start.entity.TaskList; package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class CountGajgEntity { public class CountGajgEntity {
private String gajgName; private String gajgName;
private Integer gajgCount; private Integer gajgCount;
......
src/main/java/com/yxproject/start/entity/TaskList/TaskListEntity.java
View file @ 900180b0
package com.yxproject.start.entity.TaskList; package com.yxproject.start.entity.TaskList;
import org.springframework.stereotype.Component;
@Component
public class TaskListEntity { public class TaskListEntity {
private String countyName; private String countyName;
private String gajgName; private String gajgName;
......
src/main/java/com/yxproject/start/entity/UserInfo.java
View file @ 900180b0
...@@ -5,7 +5,7 @@ import java.io.Serializable; ...@@ -5,7 +5,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author zhangyusheng * @author liboyang
*/ */
@Entity @Entity
@Table(name="USER_INFO") @Table(name="USER_INFO")
...@@ -19,7 +19,6 @@ public class UserInfo implements Serializable { ...@@ -19,7 +19,6 @@ public class UserInfo implements Serializable {
private String password; private String password;
private String salt; private String salt;
private byte state; private byte state;
private String workshop;
@ManyToMany(fetch= FetchType.EAGER) @ManyToMany(fetch= FetchType.EAGER)
@JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") }) @JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
private List<SysRole> roleList; private List<SysRole> roleList;
...@@ -80,11 +79,4 @@ public class UserInfo implements Serializable { ...@@ -80,11 +79,4 @@ public class UserInfo implements Serializable {
this.roleList = roleList; this.roleList = roleList;
} }
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 900180b0
...@@ -2,6 +2,10 @@ package com.yxproject.start.mapper; ...@@ -2,6 +2,10 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.FileNameDicEntity; import com.yxproject.start.entity.FileNameDicEntity;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.hibernate.validator.constraints.SafeHtml;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/** /**
* @auther zhangyusheng * @auther zhangyusheng
...@@ -9,11 +13,64 @@ import org.apache.ibatis.annotations.*; ...@@ -9,11 +13,64 @@ import org.apache.ibatis.annotations.*;
*/ */
@Mapper @Mapper
public interface FileNameDicMapper { public interface FileNameDicMapper {
@Insert("INSERT INTO FILE_NAME_DIC (FILE_NAME,UPLOAD_DATE) VALUES (#{fileName},#{uploadDate})") /**
* 保存个人邮寄信息字典表
* @param fileNameDicEntity
* @return
*/
@Insert("INSERT INTO FILE_NAME_DIC (FILE_NAME,UPLOAD_DATE,FORM_START_TIME,FORM_DEADLINE) VALUES (#{fileName},#{uploadDate},#{formStartTime},#{formDeadline})")
@Options(useGeneratedKeys=true, keyProperty="fileId", keyColumn="fileId") @Options(useGeneratedKeys=true, keyProperty="fileId", keyColumn="fileId")
public long saveFileNameDic(FileNameDicEntity fileNameDicEntity); public long saveFileNameDic(FileNameDicEntity fileNameDicEntity);
/**
* 更新个人邮寄字典表的解析状态
* 更新为已解析
* @param fileId 文件ID
* @return
*/
@Update("Updata FILE_NAME_DIC.STATE = 1 WHERE FILE_ID = #{fileId}") @Update("Updata FILE_NAME_DIC.STATE = 1 WHERE FILE_ID = #{fileId}")
public boolean updataState(@Param("fileId")String fileId); public boolean updataState(@Param("fileId")String fileId);
/**
* 按条件查询个人邮寄字典表
* @param fileName 文件名称
* @param analysisState 解析状态
* @return
*/
@Select("<script> " +
"select * from (select FILE_NAME_DIC.*,rownum rn from FILE_NAME_DIC " +
"<where> 1=1 " +
"<if test='analysisState != -1' >" +
" and STATE =#{analysisState}" +
"</if>" +
"<if test='uploadDate !=null' >" +
" and to_char(UPLOAD_DATE,'yyyyMMdd') =#{uploadDate}" +
"</if>" +
"<if test='fileName != null ' >" +
" and FILE_NAME =#{fileName}" +
"</if>" +
" </where>" +
"and ROWNUM less then #{maxNum} ) where rn more then #{minNum} " +
"</script>")
public List<FileNameDicEntity> queryFileNameDic(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
/**
* 按条件查询个人邮寄字典表数量
* @param fileName 文件名称
* @param analysisState 解析状态
* @return
*/
@Select("<script> select FILE_NAME_DIC.*,rownum rn from FILE_NAME_DIC " +
"<where> 1=1 " +
"<if test='analysisState != -1' >" +
" and STATE =#{analysisState}" +
"</if>" +
"<if test='uploadDate !=null' >" +
" and to_char(UPLOAD_DATE,'yyyyMMdd') =#{uploadDate}" +
"</if>" +
"<if test='fileName != null ' >" +
" and FILE_NAME =#{fileName}" +
"</if> </where> </script>")
public List<FileNameDicEntity> queryFileNameDicCount(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState);
} }
src/main/java/com/yxproject/start/mapper/FilesMapper.java
View file @ 900180b0
...@@ -2,21 +2,53 @@ package com.yxproject.start.mapper; ...@@ -2,21 +2,53 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountDataEntity; import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface FilesMapper { public interface FilesMapper {
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" + @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})") "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName})")
public boolean insertFiles(FilesEntity filesEntity); @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public long insertFiles(FilesEntity filesEntity);
@Select("") @Select("<script> " +
public List<CountDataEntity> selectFilesCount(); "select * from (select upload_date upload_Date ,count(ID) package_Count,sum(sumCount) cardCount,sum(ordinaryCount) commonCardCount,sum(postCount) postCardCount ,rownum rn " +
"from (SELECT FILES.upload_date,FILES.ID,count(prepro_person.JMSFZSLH) as sumCount, " +
"sum(decode(PREPRO_PERSON.CARD_TYPE_ID,0,1,0)) as ordinaryCount ,sum(decode(PREPRO_PERSON.CARD_TYPE_ID,9,1,0)) as postCount " +
" FROM PREPRO_PERSON " +
"left join FILES on PREPRO_PERSON.FILE_ID = FILES.ID " +
"where " +"1=1" +
"<if test=\"importDate !=null\">"+
" and to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
"</if> "+
"group by FILES.upload_date,FILES.ID) where ROWNUM less then #{maxNum} group by upload_date" +
") where rn more then #{minNum} </script>")
public List<CountDataEntity> selectFiles(@Param("importDate") String importDate,@Param("maxNum")long maxNum,@Param("minNum")long minNum);
@Select({"<script>"+
"select upload_date upload_Date," +
"count(ID) package_Count," +
"sum(sumCount) cardCount," +
"sum(ordinaryCount) commonCardCount," +
"sum(postCount) postCardCount " +
"FROM (SELECT FILES.upload_date upload_date,FILES.ID," +
"count(prepro_person.JMSFZSLH) as sumCount," +
"sum(decode(PREPRO_PERSON.CARD_TYPE_ID,0,1,0)) as ordinaryCount," +
"sum(decode(PREPRO_PERSON.CARD_TYPE_ID,9,1,0)) as postCount " +
"FROM PREPRO_PERSON " +
"left join FILES on PREPRO_PERSON.FILE_ID = FILES.ID " +
"where 1=1" +
"<if test='importDate !=null'>" +
" and to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
"</if>"+
" group by FILES.upload_date,FILES.ID)a" +
" group by a.upload_date " +
"select * from PREPRO_PERSON"+
"</script>"})
public List<CountDataEntity> selectFilesCount(@Param("importDate") String importDate);
} }
src/main/java/com/yxproject/start/mapper/NewFilesMapper.java 0 → 100644
View file @ 900180b0
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 @ 900180b0
...@@ -24,23 +24,42 @@ public interface PreproPersonMapper { ...@@ -24,23 +24,42 @@ public interface PreproPersonMapper {
/*按条件查询制证数据*/ /*按条件查询制证数据*/
@Select("select * from PREPRO_PERSON \n" + @Select({"<script>"+
"left join files on PREPRO_PERSON.FILE_ID = files.ID\n" + "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 "+
"left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " + "<where> " +
"where 1=1 " + " 1=1" +
" <where>" + "<if test='uploadNo != null '>"+
" <if test='uploadNo != null'> and PREPRO_PERSON.JMSFZSLH = #{uploadNo} </if>" + "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
" <if test='IDCard != null'> and GMSFHM = #{IDCard} </if> " + "</if>"+
" <if test='oldFile != null'> and files.SOURCE_FILE_NAME =#{oldFile} </if> " + " <if test='IDCard != null '> ",
" <if test='newFile != null'> and NEW_FILES.NEW_FILE_NAME = #{newFile} </if> " + "and GMSFHM = #{IDCard} ",
" <if test='SSXQDM != null'> and PREPRO_PERSON.SSXQDM =#{SSXQDM} </if> " + "</if> " ,
" <if test='cardType != null'> and PREPRO_PERSON.CARD_TYPE_ID =#{cardType} </if> " + " <if test='oldFile != null '> ",
" <if test='state != null'> and PREPRO_PERSON.state = #{state} </if> " + "and files.SOURCE_FILE_NAME =#{oldFile} ",
" <if test='uploadDate != null'> and files.CREAT_TIME = #{uploadDate} </if> " + " </if> " ,
" </where>") " <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); 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}") @Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
public boolean updateState (@Param("state")String state, @Param("acceptNo") String 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 @ 900180b0
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
/** /**
...@@ -9,6 +10,6 @@ import org.apache.ibatis.annotations.Select; ...@@ -9,6 +10,6 @@ import org.apache.ibatis.annotations.Select;
*/ */
@Mapper @Mapper
public interface QuerySequenceMapper { public interface QuerySequenceMapper {
@Select("select #{sequenceName} from dual") @Select("select #{sequenceName},#{sequenceName} as num2 from dual")
public String selectSequenceNextValue(String sequenceName); public Object[] selectSequenceNextValue(@Param("sequenceName") String sequenceName);
} }
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @ 900180b0
...@@ -2,8 +2,10 @@ package com.yxproject.start.mapper; ...@@ -2,8 +2,10 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.SysPermission; import com.yxproject.start.entity.SysPermission;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author Administrator * @author Administrator
...@@ -14,8 +16,8 @@ public interface SysPermissionMapper{ ...@@ -14,8 +16,8 @@ public interface SysPermissionMapper{
* 新增权限 * 新增权限
* @param sysPermission * @param sysPermission
*/ */
@Insert("INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n" + @Insert("INSERT INTO sys_permission (id,available,name,permission,url)\n" +
"VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},#{url})") "VALUES (PERMISSION_seq.nextval,0,#{name},#{permission},#{url})")
public void addPermissionByMap(SysPermission sysPermission); public void addPermissionByMap(SysPermission sysPermission);
/** /**
...@@ -74,7 +76,7 @@ public interface SysPermissionMapper{ ...@@ -74,7 +76,7 @@ public interface SysPermissionMapper{
* 修改权限信息 * 修改权限信息
* @param sysPermission * @param sysPermission
*/ */
@Update("update SYS_PERMISSION SET NAME=#{name},resource_type=#{resource_type},url=#{url}," + @Update("update SYS_PERMISSION SET NAME=#{name},url=#{url}," +
"permission=#{permission} where id=#{id}") "permission=#{permission} where id=#{id}")
public void updatePermission(SysPermission sysPermission); public void updatePermission(SysPermission sysPermission);
} }
src/main/java/com/yxproject/start/mapper/SysRoleMapper.java
View file @ 900180b0
...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper; ...@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.SysRole; import com.yxproject.start.entity.SysRole;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -14,8 +15,8 @@ public interface SysRoleMapper { ...@@ -14,8 +15,8 @@ public interface SysRoleMapper {
* 添加角色 * 添加角色
* @param sysRole * @param sysRole
*/ */
@Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE)\n" + @Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE,PROCESS)\n" +
"VALUES(PERMISSION_seq.nextval,0,#{description},#{role})") "VALUES(PERMISSION_seq.nextval,0,#{description},#{role},#{process})")
@Options(useGeneratedKeys = true, keyProperty = "id",keyColumn = "id") @Options(useGeneratedKeys = true, keyProperty = "id",keyColumn = "id")
public void addRoleByMap(SysRole sysRole); public void addRoleByMap(SysRole sysRole);
...@@ -36,6 +37,7 @@ public interface SysRoleMapper { ...@@ -36,6 +37,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"), @Result(property = "role",column = "role"),
@Result(property = "description",column = "description"), @Result(property = "description",column = "description"),
@Result(property = "available",column = "available"), @Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id", @Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))}) many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
public List<SysRole> selectAllRole(); public List<SysRole> selectAllRole();
...@@ -65,6 +67,7 @@ public interface SysRoleMapper { ...@@ -65,6 +67,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"), @Result(property = "role",column = "role"),
@Result(property = "description",column = "description"), @Result(property = "description",column = "description"),
@Result(property = "available",column = "available"), @Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id", @Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))}) many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
List<SysRole> selectRoleAndPermissionByUserId(@Param("userId") Integer userId); List<SysRole> selectRoleAndPermissionByUserId(@Param("userId") Integer userId);
...@@ -102,6 +105,7 @@ public interface SysRoleMapper { ...@@ -102,6 +105,7 @@ public interface SysRoleMapper {
@Result(property = "role",column = "role"), @Result(property = "role",column = "role"),
@Result(property = "description",column = "description"), @Result(property = "description",column = "description"),
@Result(property = "available",column = "available"), @Result(property = "available",column = "available"),
@Result(property = "process",column = "process"),
@Result(property = "permissions",javaType = List.class,column ="id", @Result(property = "permissions",javaType = List.class,column ="id",
many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))}) many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
public SysRole selectRoleByRoleId(@Param("roleId") Integer roleId); public SysRole selectRoleByRoleId(@Param("roleId") Integer roleId);
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 900180b0
...@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskList.TaskListEntity; ...@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskList.TaskListEntity;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author Administrator * @author Administrator
...@@ -27,6 +28,20 @@ public interface TaskListMapper { ...@@ -27,6 +28,20 @@ public interface TaskListMapper {
" GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)") " GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)")
public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate); public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate);
/**
* 循环单查询
* 受理库
* @param submitDate
* @return
*/
@Select("select DISTINCT CARD_TYPE_DIC.*, ACC_GROUP_T.* ,county_dic.* from ACC_CARD_T@ACCU_LINK \n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
"left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
"left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)= county_dic.COUNTY_CODE\n" +
"where county_dic.COUNTY_CODE is not null and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate}")
public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
/** /**
* 派出所计数查询 * 派出所计数查询
...@@ -81,15 +96,6 @@ public interface TaskListMapper { ...@@ -81,15 +96,6 @@ public interface TaskListMapper {
public boolean updateState(@Param("taskId") String taskId); public boolean updateState(@Param("taskId") String taskId);
/**
* 区县计数查询
* 辅助库
* @param submitDate
* @return
*/
@Select("")
public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
......
src/main/java/com/yxproject/start/service/FileNameDicService.java
View file @ 900180b0
...@@ -2,10 +2,34 @@ package com.yxproject.start.service; ...@@ -2,10 +2,34 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.FileNameDicEntity; import com.yxproject.start.entity.FileNameDicEntity;
import java.util.List;
/** /**
* @auther zhangyusheng * @auther zhangyusheng
* 2019/3/1 10:42 * 2019/3/1 10:42
*/ */
public interface FileNameDicService { public interface FileNameDicService {
/**
* 保存个人邮寄信息字典表
* @param fileNameDicEntity
* @return
*/
public long saveFileNameDic(FileNameDicEntity fileNameDicEntity); public long saveFileNameDic(FileNameDicEntity fileNameDicEntity);
/**
* 查询个人邮寄信息字典表
* @param fileName 文件名称
* @param analysisState 解析状态
* @param currPage 当前页
* @param pageSize 页面数量
* @return
*/
public List<FileNameDicEntity> queryFileNameDic(String uploadDate,String fileName, long analysisState, long currPage, long pageSize);
/**
* 查询个人邮寄信息字典表数量
* @param fileName 文件名称
* @param analysisState 解析状态
* @return
*/
public int queryFileNameDicCount(String uploadDate,String fileName, long analysisState);
} }
src/main/java/com/yxproject/start/service/ImportXmlService.java
View file @ 900180b0
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
...@@ -12,4 +13,7 @@ import java.util.List; ...@@ -12,4 +13,7 @@ import java.util.List;
public interface ImportXmlService { public interface ImportXmlService {
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity); 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/NewFilesService.java 0 → 100644
View file @ 900180b0
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 @ 900180b0
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.FileNameDicEntity;
import com.yxproject.start.entity.PersonPostEntity; import com.yxproject.start.entity.PersonPostEntity;
import java.util.Date; import java.util.Date;
...@@ -12,7 +13,7 @@ import java.util.List; ...@@ -12,7 +13,7 @@ import java.util.List;
public interface PersonPostService { public interface PersonPostService {
/** /**
* 解析制证包 * 文件解析 修改解析状态
* @param fileId * @param fileId
* @param creatTime * @param creatTime
* @return * @return
......
src/main/java/com/yxproject/start/service/PreproPersonService.java
View file @ 900180b0
...@@ -14,4 +14,6 @@ public interface PreproPersonService { ...@@ -14,4 +14,6 @@ public interface PreproPersonService {
public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate); 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/TaskListService.java
View file @ 900180b0
...@@ -18,4 +18,6 @@ public interface TaskListService { ...@@ -18,4 +18,6 @@ public interface TaskListService {
public boolean createTaskList(List<TaskListEntity> resultMap); public boolean createTaskList(List<TaskListEntity> resultMap);
public boolean updateState(String taskId); public boolean updateState(String taskId);
public List<Object> selectByCountyAtACCU(String date);
} }
src/main/java/com/yxproject/start/service/impl/FileNameDicServiceImpl.java
View file @ 900180b0
...@@ -6,6 +6,8 @@ import com.yxproject.start.service.FileNameDicService; ...@@ -6,6 +6,8 @@ import com.yxproject.start.service.FileNameDicService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @auther zhangyusheng * @auther zhangyusheng
* 2019/3/1 10:43 * 2019/3/1 10:43
...@@ -20,4 +22,16 @@ public class FileNameDicServiceImpl implements FileNameDicService { ...@@ -20,4 +22,16 @@ public class FileNameDicServiceImpl implements FileNameDicService {
long fileId = fileNameDicMapper.saveFileNameDic(fileNameDicEntity); long fileId = fileNameDicMapper.saveFileNameDic(fileNameDicEntity);
return fileId; return fileId;
} }
@Override
public List<FileNameDicEntity> queryFileNameDic(String uploadDate,String fileName, long analysisState, long currPage, long pageSize) {
return fileNameDicMapper.queryFileNameDic(uploadDate,fileName, analysisState, currPage*pageSize,(currPage-1)*pageSize+1 );
// return null;
}
@Override
public int queryFileNameDicCount(String uploadDate,String fileName, long analysisState) {
// return 2;
return fileNameDicMapper.queryFileNameDicCount(uploadDate,fileName, analysisState ).size();
}
} }
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ 900180b0
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.mapper.FilesMapper; import com.yxproject.start.mapper.FilesMapper;
...@@ -21,17 +22,33 @@ public class ImportXmlServiceImpl implements ImportXmlService { ...@@ -21,17 +22,33 @@ public class ImportXmlServiceImpl implements ImportXmlService {
@Autowired @Autowired
private FilesMapper filesMapper; private FilesMapper filesMapper;
/**
*
* @param preproPersonEntities
* @param filesEntity
* @return
*/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity) { public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities, FilesEntity filesEntity) {
long l = filesMapper.insertFiles(filesEntity);
filesMapper.insertFiles(filesEntity); for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
for (PreproPersonEntity preproPersonEntity:preproPersonEntities){ preproPersonEntity.setFileId(l);
System.out.println(preproPersonEntity.getJmsfzslh()+"___________"); preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
} }
return true; return true;
} }
@Override
public List<CountDataEntity> queryPersonXml(String importDate, long maxNum, long minNum) {
return filesMapper.selectFiles(importDate,maxNum,minNum);
// return null;
}
@Override
public int queryPersonXmlCount(String importDate) {
// return 2;
return filesMapper.selectFilesCount(importDate).size();
}
} }
src/main/java/com/yxproject/start/service/impl/NewFilesServiceImpl.java 0 → 100644
View file @ 900180b0
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/PersonPostServiceImpl.java
View file @ 900180b0
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FileNameDicEntity;
import com.yxproject.start.entity.PersonPostEntity; import com.yxproject.start.entity.PersonPostEntity;
import com.yxproject.start.mapper.FileNameDicMapper; import com.yxproject.start.mapper.FileNameDicMapper;
import com.yxproject.start.mapper.PersonPostMapper; import com.yxproject.start.mapper.PersonPostMapper;
...@@ -34,6 +35,12 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -34,6 +35,12 @@ public class PersonPostServiceImpl implements PersonPostService {
return true; return true;
} }
/**
* 文件解析 修改解析状态
* @param fileId
* @param creatTime
* @return
*/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean updateIsPost(String fileId, String creatTime) { public boolean updateIsPost(String fileId, String creatTime) {
...@@ -41,7 +48,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -41,7 +48,7 @@ public class PersonPostServiceImpl implements PersonPostService {
personPostMapper.updateIsPost(fileId,creatTime); personPostMapper.updateIsPost(fileId,creatTime);
return true; return true;
} }
//TODO
@Override @Override
public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){ public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
String str = null; String str = null;
...@@ -62,5 +69,17 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -62,5 +69,17 @@ public class PersonPostServiceImpl implements PersonPostService {
return true; return true;
} }
// /**
// * 查询个人邮寄信息
// * @param fileName 文件名
// * @param analysisState 解析时间
// * @param currPage 当前页
// * @param pageSize 每页数量
// * @return
// */
// @Override
// public List<FileNameDicEntity> queryFileNameDic(String fileName, long analysisState, long currPage, long pageSize) {
//// List<FileNameDicEntity> fileNameDicEntities = fileNameDicMapper.queryFileNameDic(fileName, analysisState, currPage, pageSize);
// return fileNameDicEntities;
// }
} }
src/main/java/com/yxproject/start/service/impl/PreproPersonServiceImpl.java
View file @ 900180b0
...@@ -24,7 +24,29 @@ public class PreproPersonServiceImpl implements PreproPersonService { ...@@ -24,7 +24,29 @@ public class PreproPersonServiceImpl implements PreproPersonService {
} }
@Override @Override
public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) { 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(null, null, null, null, null, 0+"", null, null); List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate));
return preproPersonEntities; 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/TaskListServiceImpl.java
View file @ 900180b0
...@@ -5,10 +5,15 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity; ...@@ -5,10 +5,15 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity; import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.mapper.TaskListMapper; import com.yxproject.start.mapper.TaskListMapper;
import com.yxproject.start.service.TaskListService; import com.yxproject.start.service.TaskListService;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.jws.Oneway;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
public class TaskListServiceImpl implements TaskListService { public class TaskListServiceImpl implements TaskListService {
...@@ -44,4 +49,22 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -44,4 +49,22 @@ public class TaskListServiceImpl implements TaskListService {
taskListMapper.updateState(taskId); taskListMapper.updateState(taskId);
return true; return true;
} }
@Override
public List<Object> selectByCountyAtACCU(String date) {
List<Map<String, Object>> maps = taskListMapper.selectByCountyAtACCU(date);
List<Map<String,Object>> list = new ArrayList<>();
for (Map o :maps){
//TODO 组合JSON
Map<String,Object> countyMap = new LinkedHashMap<>();
countyMap.containsKey((Map<String,Object>)o);
}
System.out.println(maps.toString()+"---------");
return null;
}
} }
src/main/java/com/yxproject/start/utils/ExportXml.java deleted 100644 → 0
View file @ 47b12f64
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/IDCardFactory.java
View file @ 900180b0
package com.yxproject.start.utils; package com.yxproject.start.utils;
//import com.yingxin.hibernate.domain.ProductionEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
import org.dom4j.Document; import org.dom4j.Document;
...@@ -41,7 +40,7 @@ public class IDCardFactory { ...@@ -41,7 +40,7 @@ public class IDCardFactory {
filesEntity.setDwmc(DWMC); filesEntity.setDwmc(DWMC);
Date date = new Date(); Date date = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreatTime(simpleDateFormat.format(date)); filesEntity.setCreateTime(simpleDateFormat.format(date));
List<Element> recordlist = records.elements("RECORD"); List<Element> recordlist = records.elements("RECORD");
for (Element e : recordlist) { for (Element e : recordlist) {
...@@ -70,6 +69,7 @@ public class IDCardFactory { ...@@ -70,6 +69,7 @@ public class IDCardFactory {
preproPersonEntity.setSjrLxdh(e.element("SJR_LXDH").getStringValue()); preproPersonEntity.setSjrLxdh(e.element("SJR_LXDH").getStringValue());
preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue()); preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue());
preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue()); preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue());
// preproPersonEntity.setFileId();
preproPersonEntityList.add(preproPersonEntity); preproPersonEntityList.add(preproPersonEntity);
System.out.println(preproPersonEntity.getJmsfzslh()+"--------------"); System.out.println(preproPersonEntity.getJmsfzslh()+"--------------");
} }
......
src/main/java/com/yxproject/start/utils/IDCardXmlUtils.java deleted 100644 → 0
View file @ 47b12f64
//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 @ 900180b0
...@@ -13,8 +13,8 @@ public class QuerySequenceSercive { ...@@ -13,8 +13,8 @@ public class QuerySequenceSercive {
@Autowired @Autowired
private QuerySequenceMapper querySequenceMapper; private QuerySequenceMapper querySequenceMapper;
public String selectSequenceNextValue(String sequenceName){ public String selectSequenceNextValue(String sequenceName){
String s = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval()"); Object[] objects = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
return s; return "";
} }
......
src/main/resources/application.yml
View file @ 900180b0
...@@ -18,6 +18,6 @@ spring: ...@@ -18,6 +18,6 @@ spring:
mybatis: mybatis:
type-aliases-package: com.yxproject.start.entity type-aliases-package: com.yxproject.start.entity
#加载Mybatis配置文件 #加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/config/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.xml config-location: classpath:mapper/config/mybatis-config.xml
src/main/resources/mapper/config/mybatis-config.xml
View file @ 900180b0
...@@ -5,5 +5,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" ...@@ -5,5 +5,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<configuration> <configuration>
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="logImpl" value="STDOUT_LOGGING" />
</settings> </settings>
</configuration> </configuration>
\ No newline at end of file
src/main/resources/static/css/app.css
View file @ 900180b0
...@@ -299,4 +299,6 @@ p { ...@@ -299,4 +299,6 @@ p {
font-family: 'Arial Black'; font-family: 'Arial Black';
color:#000; color:#000;
} }
.padding10{
padding: 10px;
}
src/main/resources/static/dialogs/analysisDialog.html 0 → 100644
View file @ 900180b0
<div class="ui-dialog-title" >
请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 制证包
</div>
<div class="ui-dialog-content">
<table class="table table-hover" >
<thead>
<tr>
<th>NO.</th>
<th>上传时间</th>
<th>格口文件名</th>
<th>数量</th>
<th>订单起始日期</th>
<th>订单截至日期</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr >
<td>1</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>2</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>3</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>4</td>
<td>
2019-03-04 15:08
</td>
<td>
格口文件.xls
</td>
<td>
400
</td>
<td>
2019-03-01
</td>
<td>
2019-03-03
</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<div class="progress">
<div class="progress-bar progress-bar-success progress-bar-striped"
role="progressbar"
aria-valuemin="0"
aria-valuemax="100"
style="width: 90%"> 90% Complete (success)
</div>
</div>
</div>
<div style="text-align: center;">
<button class="btn btn-success" style="width: 70%" ng-click="closeThisDialog()">关闭</button>
</div>
\ No newline at end of file
src/main/resources/static/index.html
View file @ 900180b0
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<link rel="stylesheet" href="components/bootstrap-3.3.7/css/bootstrap-datetimepicker.min.css"> <link rel="stylesheet" href="components/bootstrap-3.3.7/css/bootstrap-datetimepicker.min.css">
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="newTheme/bower_components/select2/dist/css/select2.min.css"> <link rel="stylesheet" href="newTheme/bower_components/select2/dist/css/select2.min.css">
<script src="newTheme/bower_components/select2/dist/js/select2.full.min.js"></script> <script src="newTheme/bower_components/select2/dist/js/select2.full.min.js"></script>
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="newTheme/dist/css/AdminLTE.min.css"> <link rel="stylesheet" href="newTheme/dist/css/AdminLTE.min.css">
<!-- Font Awesome --> <!-- Font Awesome -->
...@@ -71,178 +71,183 @@ ...@@ -71,178 +71,183 @@
<script language="javascript" src="components/js/LodopFuncs.js"></script> <script language="javascript" src="components/js/LodopFuncs.js"></script>
</head> </head>
<OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa" width="0px" height="0px" style="float: left;" CODEBASE="plugin/Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT> <OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa" width="0px" height="0px" style="float: left;"
CODEBASE="plugin/Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT>
<body class="hold-transition skin-blue-light sidebar-mini"> <body class="hold-transition skin-blue-light sidebar-mini">
<div ng-if="loginData.login == true" class="wrapper"> <div ng-if="loginData.login == true" class="wrapper">
<header class="main-header"> <header class="main-header">
<!-- Logo --> <!-- Logo -->
<a href="index.html" class="logo" style="line-height: 50px;"> <a href="index.html" class="logo" style="line-height: 50px;">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><span>bhl</span></span> <span class="logo-mini"><span>{{loginData.name}}</span></span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<span class="logo-lg"><span>数据核验</span></span> <span class="logo-lg"><span>{{loginData.roleList[0].role}}</span></span>
</a> </a>
<!-- Header Navbar: style can be found in header.less --> <!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top"> <!---导航左边-->
<!-- Sidebar toggle button--> <nav class="navbar navbar-static-top">
<a class="sidebar-toggle" data-toggle="push-menu" role="button"> <!-- Sidebar toggle button-->
<span class="sr-only">Toggle navigation</span> <ul class="navbar-nav no-padding">
</a> <li class="nav-item">
<div style="text-align: right;font-size:1.8em;line-height: 50px;color: #fff;font-family:'黑体';padding-right: 20px;">北京制证辅助平台</div> <a class="sidebar-toggle" data-toggle="push-menu" role="button">
</nav> <span class="sr-only">Toggle navigation</span>
</header> </a>
<aside class="main-sidebar"> </li>
<!-- sidebar: style can be found in sidebar.less --> <li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;">
<section class="sidebar" > <form style="margin-top: 6px;">
<!-- search form --> <div class="input-group input-group-sm">
<form class="sidebar-form"> <input type="text" class="form-control input-sm bg-light no-border padder" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
<div class="input-group"> <span class="input-group-btn">
<input type="text" name="q" class="form-control" ng-model="searchInput" placeholder="Search..."> <button type="button" style="height: 35px;background-color: #fff;border-left:0;outline:none;" ng-click="doSearch(searchInput)" class="btn btn-sm bg-light">
<span class="input-group-btn"> <i class="fa fa-search"></i>
<button type="submit" name="search" id="search-btn" class="btn btn-flat" ng-click="doSearch(searchInput)"> </button>
<i class="fa fa-search"></i>
</button>
</span>
</div>
</form>
<!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="sidebar-menu" data-widget="tree">
<li class="header">
导航
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/xmlAndSearch']" ng-click="getFocus('/xmlAndSearch')">
<a href="#!/xmlAndSearch">
<i class="fa fa-file-code-o"></i>
<span>制证包管理</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/excelAndSearch']" ng-click="getFocus('/excelAndSearch')">
<a href="#!/excelAndSearch">
<i class="fa fa-file-excel-o"></i>
<span>格口文件管理</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/cardProdPackage']" ng-click="getFocus('/cardProdPackage')">
<a href="#!/cardProdPackage">
<i class="fa fa-folder"></i>
<span>制证信息打包</span>
</a>
</li>
<li class="treeview" ng-class="{true: 'active', false: ''}[tab =='/cardProdUpdate']" ng-click="getFocus('/cardProdUpdate')">
<a href="#">
<i class="fa fa-cog"></i> <span>系统管理</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span> </span>
</a> </div>
<ul class="treeview-menu"> </form>
<li><a href="#!/analysisLog"><i class="fa fa-circle-o"></i> 解析日志</a></li> </li>
<li><a href="#!/packageLog"><i class="fa fa-circle-o"></i> 新包日志</a></li> </ul>
<li><a href="#!/cardProdUpdate"><i class="fa fa-circle-o"></i> 制证信息管理</a></li>
</ul>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/searchCardMsg']" ng-click="getFocus('/searchCardMsg')"> <!--导航右边-->
<a href="#!/searchCardMsg"> <div class="navbar-custom-menu">
<i class="fa fa-files-o"></i> <ul class="nav navbar-nav">
<span>邮政快递单打印</span> <!-- Messages: style can be found in dropdown.less-->
</a> <li class="dropdown messages-menu">
</li> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<li ng-class="{true: 'active', false: ''}[tab =='/uploadExcelAndSearch']" ng-click="getFocus('/uploadExcelAndSearch')"> <i class="fa fa-envelope-o"></i>
<a href="#!/uploadExcelAndSearch"> <span class="label label-success">4</span>
<i class="fa fa-table"></i> </a>
<span>邮政信息查询</span> <ul class="dropdown-menu">
</a> <li class="header">You have 4 messages</li>
</li> <li>
<li ng-class="{true: 'active', false: ''}[tab =='/createTaskList']" ng-click="getFocus('/createTaskList')"> <!-- inner menu: contains the actual data -->
<a href="#!/createTaskList"> <ul class="menu">
<i class="fa fa-dashboard"></i> <li><!-- start message -->
<span>任务单创建</span> <a href="#">
</a> <p>Why not buy a new awesome theme?</p>
</li> </a>
<li ng-class="{true: 'active', false: ''}[tab =='/dispatchTask']" ng-click="getFocus('/dispatchTask')"> </li>
<a href="#!/dispatchTask"> <li><!-- start message -->
<i class="fa fa-dashboard"></i> <a href="#">
<span>任务单下发</span> <p>Why not buy a new awesome theme?</p>
</a> </a>
</li>
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
</ul>
</li> </li>
<li class="footer"><a href="#">See All Messages</a></li>
</ul>
</li>
<!-- Notifications: style can be found in dropdown.less -->
<li class="dropdown notifications-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bell-o"></i>
<span class="label label-warning">10</span>
</a>
<ul class="dropdown-menu">
<li class="header">You have 10 notifications</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<li>
<a href="#">
<i class="fa fa-users text-aqua"></i> 5 new members joined today
</a>
</li>
<li>
<a href="#">
<i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
page and may cause design problems
</a>
</li>
<li>
<a href="#">
<i class="fa fa-users text-red"></i> 5 new members joined
</a>
</li>
<li>
<a href="#">
<i class="fa fa-shopping-cart text-green"></i> 25 sales made
</a>
</li>
<li>
<a href="#">
<i class="fa fa-user text-red"></i> You changed your username
</a>
</li>
</ul>
</li>
<li class="footer"><a href="#">View all</a></li>
</ul>
</li>
<li class="dropdown user">
<li ng-class="{true: 'active', false: ''}[tab =='/taskListPrint']" ng-click="getFocus('/taskListPrint')"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<a href="#!/taskListPrint"> <i class="glyphicon glyphicon-user"></i>
<i class="fa fa-dashboard"></i> <span class="hidden-xs">{{loginData.name}}</span>
<span>膜打印任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListPreLocating']" ng-click="getFocus('/taskListPreLocating')">
<a href="#!/taskListPreLocating">
<i class="fa fa-dashboard"></i>
<span>预定位任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListQualityCheck']" ng-click="getFocus('/taskListQualityCheck')">
<a href="#!/taskListQualityCheck">
<i class="fa fa-dashboard"></i>
<span>质检任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListSorting']" ng-click="getFocus('/taskListSorting')">
<a href="#!/taskListSorting">
<i class="fa fa-dashboard"></i>
<span>分拣任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/tagPrint']" ng-click="getFocus('/tagPrint')">
<a href="#!/tagPrint">
<i class="fa fa-dashboard"></i>
<span>打印封条</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
<a href="#!/receitp">
<i class="fa fa-file-text-o"></i>
<span>交接单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/addFailed']" ng-click="getFocus('/addFailed')">
<a href="#!/addFailed">
<i class="fa fa-plus"></i>
<span>添加废证</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/addRest']" ng-click="getFocus('/addRest')">
<a href="#!/addRest">
<i class="fa fa-plus"></i>
<span>添加余证</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/historyBack']" ng-click="getFocus('/historyBack')">
<a href="#!/historyBack">
<i class="fa fa-plus"></i>
<span>历史回迁证</span>
</a>
</li>
<li>
<a ng-click="logout()">
<i class="glyphicon glyphicon-user"></i>
<span>退出当前用户</span>
</a> </a>
<ul class="dropdown-menu">
<li style="padding: 5px;">
<a ng-click="logout()" class="btn btn-default btn-flat">退出当前用户</a>
</li>
</ul>
</li>
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 0;">
<img src="newTheme/dist/img/logo.jpg" class="user-image" alt="User Image">
<span style="font-size: 1.7em;">北京制证辅助平台</span>
</a>
</li> </li>
</ul> </ul>
</section>
<!-- /.sidebar -->
</aside>
<div class="content-wrapper" ng-view style="min-height: 589px;"></div>
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>联系电话:</b>(010)88516568
</div> </div>
<strong>北京盈信信息科技版权所有</strong>
</footer> </nav>
</div> </header>
<div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;"> <aside class="main-sidebar">
<div style="min-height: 500px;" ng-view></div> <!-- sidebar: style can be found in sidebar.less -->
</div> <section class="sidebar">
<!-- search form -->
<!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="sidebar-menu" data-widget="tree">
<li class="header">
导航
</li>
<li ng-repeat="menu in menuList | orderBy:'id'" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus(menu.url)">
<a href="#!{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span ng-bind="menu.name"></span>
</a>
</li>
<li>
<a ng-click="logout()">
<i class="glyphicon glyphicon-user"></i>
<span>退出当前用户</span>
</a>
</li>
</ul>
</section>
<!-- /.sidebar -->
</aside>
<div class="content-wrapper" ng-view style="min-height: 589px;"></div>
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>联系电话:</b>(010)88516568
</div>
<strong>北京盈信信息科技所有</strong>
</footer>
</div>
<div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;">
<div style="min-height: 500px;" ng-view></div>
</div>
<!-- iCheck --> <!-- iCheck -->
<script src="js/app.js"></script> <script src="js/app.js"></script>
......
src/main/resources/static/js/app.js
View file @ 900180b0
...@@ -24,9 +24,9 @@ angular.module('AvatarCheck', [ ...@@ -24,9 +24,9 @@ angular.module('AvatarCheck', [
'AvatarCheck.packageLog', 'AvatarCheck.packageLog',
'AvatarCheck.tagPrint', 'AvatarCheck.tagPrint',
'tm.pagination' 'tm.pagination'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/xmlAndSearch'}); $routeProvider.otherwise({redirectTo: '/createTaskList'});
localStorageServiceProvider.setPrefix('AvatarCheck') localStorageServiceProvider.setPrefix('AvatarCheck')
$qProvider.errorOnUnhandledRejections(false) $qProvider.errorOnUnhandledRejections(false)
}]) }])
...@@ -37,15 +37,42 @@ angular.module('AvatarCheck', [ ...@@ -37,15 +37,42 @@ angular.module('AvatarCheck', [
$rootScope.loginData = localStorageService.get('loginData') $rootScope.loginData = localStorageService.get('loginData')
$scope.id = 'id';
if($rootScope.loginData == null){ if($rootScope.loginData == null){
$rootScope.loginData = {userid:'用户未登录', login:false}; $rootScope.loginData = {userid:'用户未登录', login:false};
} }
if($rootScope.loginData.login == false){ if($rootScope.loginData.login == false){
$location.path("/login"); $location.path("/login");
} }
if($rootScope.loginData.login == true){
$scope.icons = [
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker"
]
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
}
$rootScope.tab = '/xmlAndSearch';
if ($location.path() == "/excelAndSearch") { if ($location.path() == "/excelAndSearch") {
$rootScope.tab = '/excelAndSearch'; $rootScope.tab = '/excelAndSearch';
} }
...@@ -118,7 +145,6 @@ angular.module('AvatarCheck', [ ...@@ -118,7 +145,6 @@ angular.module('AvatarCheck', [
} }
console.log($rootScope.tab) console.log($rootScope.tab)
$scope.getFocus = function (index) { $scope.getFocus = function (index) {
if(index=='/tagPrint'){ if(index=='/tagPrint'){
......
src/main/resources/static/js/service.js
View file @ 900180b0
...@@ -173,25 +173,65 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -173,25 +173,65 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
selectXmlPackage:function(date,state,success){ selectXmlPackageCount:function(date,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../selectXMLApi/selectXml"+urlTimeStamp(), url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
params:{ params:{
date:date, importDate:date
state:state }
}).then(function successCallback(response) {
success(response.data)
})
},
selectXmlPackage:function(date,currentPage,itemsPerPage,success){
$http({
method: 'GET',
url: "../importXML/queryPersonXML"+urlTimeStamp(),
params:{
importDate:date,
currPage:currentPage,
pageSize:itemsPerPage
}
}).then(function successCallback(response) {
success(response.data)
})
},
selectPostPackageCount:function(fileName,state,date,success){
if(angular.isUndefined(fileName)){
fileName='';
}
if(angular.isUndefined(state)){
state=-1;
}
$http({
method: 'GET',
url: "../ReadExcel/queryPersonPostCount"+urlTimeStamp(),
params:{
fileName:fileName,
analysisState:state,
uploadDate:date
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
}, },
selectPostPackage:function(fileName,state,success){ selectPostPackage:function(fileName,state,currentPage,itemsPerPage,date,success){
if(angular.isUndefined(fileName)){
fileName='';
}
if(angular.isUndefined(state)){
state=-1;
}
$http({ $http({
method: 'GET', method: 'GET',
url: "../selectExcelApi/selectExcel"+urlTimeStamp(), url: "../ReadExcel/queryPersonPost"+urlTimeStamp(),
params:{ params:{
fileName:fileName, fileName:fileName,
state:state analysisState:state,
currPage:currentPage,
pageSize:itemsPerPage,
uploadDate:date
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 900180b0
...@@ -4,13 +4,10 @@ ...@@ -4,13 +4,10 @@
vertical-align: middle!important; vertical-align: middle!important;
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
添加废证
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header with-border">废证添加</strong>
<div class="box-primary"> <div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;"> <form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span> <span style="font-size:20px;">废证数量:</span>
...@@ -53,4 +50,5 @@ ...@@ -53,4 +50,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html
View file @ 900180b0
...@@ -7,13 +7,10 @@ ...@@ -7,13 +7,10 @@
.cl:after{display:block;clear:both;content:"";visibility:hidden;height:0} .cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
.cl{zoom:1} .cl{zoom:1}
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
添加余证
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header with-border">余证添加</strong>
<div class="box-primary"> <div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;"> <form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">余证数量:</span> <span style="font-size:20px;">余证数量:</span>
...@@ -34,4 +31,5 @@ ...@@ -34,4 +31,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 900180b0
...@@ -24,14 +24,10 @@ ...@@ -24,14 +24,10 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
原始包解析日志
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header"></strong> <strong class="box-header with-border">解析日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
...@@ -89,4 +85,5 @@ ...@@ -89,4 +85,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file </div>
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 900180b0
...@@ -27,12 +27,8 @@ ...@@ -27,12 +27,8 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
制证信息打包
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">制证信息打包</strong> <strong class="box-header">制证信息打包</strong>
<div class="box-info"> <div class="box-info">
...@@ -89,7 +85,7 @@ ...@@ -89,7 +85,7 @@
</div> </div>
<div class="box box-default"> <div class="box box-default">
<strong class="box-header">制证信息详情</strong> <strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="packageData"> <table class="table table-bordered table-hover" ng-if="packageData">
<thead> <thead>
...@@ -127,4 +123,5 @@ ...@@ -127,4 +123,5 @@
<h3 ng-if="postData.length==0">暂无记录。</h3> <h3 ng-if="postData.length==0">暂无记录。</h3>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 900180b0
...@@ -27,12 +27,8 @@ ...@@ -27,12 +27,8 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
制证包删除
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">制证信息打包</strong> <strong class="box-header">制证信息打包</strong>
<div class="box-info"> <div class="box-info">
...@@ -83,7 +79,7 @@ ...@@ -83,7 +79,7 @@
</div> </div>
<div class="box box-default"> <div class="box box-default">
<strong class="box-header">查询结果</strong> <strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas"> <table class="table table-bordered table-hover" ng-if="xmlDatas">
<thead> <thead>
...@@ -140,4 +136,5 @@ ...@@ -140,4 +136,5 @@
<h3 ng-if="postData.length==0">暂无记录。</h3> <h3 ng-if="postData.length==0">暂无记录。</h3>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
任务单创建
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
...@@ -75,4 +71,5 @@ ...@@ -75,4 +71,5 @@
<!-- /.col --> <!-- /.col -->
</div> </div>
<!-- /.row --> <!-- /.row -->
</section> </div>
\ No newline at end of file </div>
\ No newline at end of file
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
任务单下发
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
...@@ -76,4 +72,5 @@ ...@@ -76,4 +72,5 @@
<!-- /.col --> <!-- /.col -->
</div> </div>
<!-- /.row --> <!-- /.row -->
</section> </div>
\ No newline at end of file </div>
\ No newline at end of file
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 900180b0
...@@ -27,12 +27,8 @@ ...@@ -27,12 +27,8 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
邮寄信息导入
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">格口文件上传</strong> <strong class="box-header">格口文件上传</strong>
<div class="box-primary"> <div class="box-primary">
...@@ -82,10 +78,22 @@ ...@@ -82,10 +78,22 @@
</div> </div>
</div> </div>
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">格口文件管理</strong> <strong class="box-header with-border">格口文件管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>上传时间:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text"
class="form-control pull-right"
ng-model="choseDate"
id="datepicker3" readonly/>
</div>
</td>
<td>文件名称:</td> <td>文件名称:</td>
<td> <td>
<input type="text" class="form-control" ng-model="fileName" placeholder="文件名称"> <input type="text" class="form-control" ng-model="fileName" placeholder="文件名称">
...@@ -97,7 +105,7 @@ ...@@ -97,7 +105,7 @@
<select class="form-control select2" id="state" ng-model="state"> <select class="form-control select2" id="state" ng-model="state">
<option value="">--请选择解析状态--</option> <option value="">--请选择解析状态--</option>
<option value="1">已解析</option> <option value="1">已解析</option>
<option value="-1">未解析</option> <option value="0">未解析</option>
</select> </select>
</td> </td>
<td> <td>
...@@ -144,4 +152,5 @@ ...@@ -144,4 +152,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 900180b0
...@@ -24,28 +24,31 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -24,28 +24,31 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$('#datepicker1').datetimepicker({ $('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
format: 'yyyy-mm-dd', format: 'yyyyMMdd',
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
format: 'yyyy-mm-dd', format: 'yyyyMMdd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker3').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyyMMdd',
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyyMMdd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
console.log($("#datepicker1").val())
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
fd.append("formStartTime",$("#datepicker1").val()); fd.append("formStartTime",$("#datepicker1").val());
...@@ -64,9 +67,20 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -64,9 +67,20 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
} }
} }
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getPostPackage = function(){ $scope.getPostPackage = function(){
console.log($scope.fileName,$scope.state) console.log($scope.fileName,$scope.state,$("#datepicker3").val())
HttpService.selectPostPackage($scope.fileName,$scope.state,function(data){ HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) {
$scope.paginationConf.totalItems = data;
console.log(data)
})
HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){
$scope.postPackageData = data; $scope.postPackageData = data;
console.log($scope.postPackageData) console.log($scope.postPackageData)
}) })
......
src/main/resources/static/views/historyCards/historyBack.html
View file @ 900180b0
...@@ -4,14 +4,10 @@ ...@@ -4,14 +4,10 @@
vertical-align: middle!important; vertical-align: middle!important;
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
历史回迁证 <div class="box box-primary">
</h4> <strong class="box-header with-border">回迁证添加</strong>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<form style="padding-left: 15px;"> <form style="padding-left: 15px;">
<span style="font-size:20px;">回迁证数量:</span> <span style="font-size:20px;">回迁证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount"> <input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
...@@ -55,6 +51,5 @@ ...@@ -55,6 +51,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/login/login.html
View file @ 900180b0
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="login-box-body" style="border-radius: 4px;"> <div class="login-box-body" style="border-radius: 4px;">
<p class="login-box-msg">用户登录</p> <p class="login-box-msg">用户登录</p>
<form> <form name="form">
<div class="text-danger wrapper text-center" ng-show="authError" style="margin-bottom: 5px;"> <div class="text-danger wrapper text-center" ng-show="authError" style="margin-bottom: 5px;">
{{authError}} {{authError}}
</div> </div>
......
src/main/resources/static/views/login/login.js
View file @ 900180b0
...@@ -28,6 +28,42 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -28,6 +28,42 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
} }
} }
var whereToGo = function(process){
switch (process){
case 1:
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
break;
case 2:
$location.path("/taskListPrint");
$rootScope.tab = '/taskListPrint';
break;
case 3:
$location.path("/taskListPreLocating");
$rootScope.tab = '/taskListPreLocating';
break;
case 4:
$location.path("/taskListSorting");
$rootScope.tab = '/taskListSorting';
break;
case 5:
$location.path("/taskListQualityCheck");
$rootScope.tab = '/taskListQualityCheck';
break;
case 6:
$location.path("/receitp");
$rootScope.tab = '/receitp';
break;
case 7:
$location.path("/uploadExcelAndSearch");
$rootScope.tab = '/uploadExcelAndSearch';
break;
case 8:
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
break;
}
}
$scope.user = {}; $scope.user = {};
$scope.doLogin = function(){ $scope.doLogin = function(){
...@@ -41,7 +77,9 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -41,7 +77,9 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.loginData = resp.data.user; $rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true; $rootScope.loginData.login =true;
localStorageService.set('loginData', resp.data.user); localStorageService.set('loginData', resp.data.user);
$location.path('/xmlAndSearch') $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
whereToGo($rootScope.loginData.roleList[0].process)
if(userAgent.indexOf('.NET')!=-1){ if(userAgent.indexOf('.NET')!=-1){
window.location.reload(); window.location.reload();
}else{ }else{
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 900180b0
...@@ -24,14 +24,10 @@ ...@@ -24,14 +24,10 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
数据打包日志
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header"></strong> <strong class="box-header with-border">打包日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
...@@ -95,4 +91,5 @@ ...@@ -95,4 +91,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/receitp/receitp.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
交接单 交接单
</h4> </div>
</section> </div>
\ No newline at end of file
src/main/resources/static/views/searchCard/searchCard.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
<div style="text-align: left;cursor:pointer;"><a ng-click="goBack()"><i class="fa fa-backward"></i> 返回</a></div>
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header"> <strong class="box-header">
查询结果 查询结果
</strong> </strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding:0px 10px 7px 10px;">
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"> <div class="panel-heading">
...@@ -95,14 +91,13 @@ ...@@ -95,14 +91,13 @@
<button class="btn btn-danger">退证</button> <button class="btn btn-danger">退证</button>
</div> </div>
</div> </div>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
制证库 制证库
</h3> </h3>
</div> </div>
<div class="panel-body"> <div class="panel-body" style="padding-bottom: 0;">
<table class="table table-hover table-bordered"> <table class="table table-hover table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -148,4 +143,5 @@ ...@@ -148,4 +143,5 @@
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ 900180b0
...@@ -11,14 +11,10 @@ ...@@ -11,14 +11,10 @@
} }
</style> </style>
<div class="content row">
<section class="content-header" style="padding-top: 1px;"> <div class="col-md-12" style="margin-top:20px;">
<h4>
邮政快递单打印
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
<div class="box-info"> <div class="box-info">
<div class="row" style="padding: 15px;"> <div class="row" style="padding: 15px;">
<div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div> <div class="col-lg-3" style="text-align: center;padding-top: 20px;"><img style="height:148px;width:115px;" id="imgDetail" class="img-thumbnail" /></div>
...@@ -62,8 +58,8 @@ ...@@ -62,8 +58,8 @@
<button class="btn btn-info" ng-click="endReading()">停止读卡</button> <button class="btn btn-info" ng-click="endReading()">停止读卡</button>
</div> </div>
</div> </div>
<div class="box box-primary"> <div class="box box-primary box-default">
<strong class="box-header">个人邮寄信息详情</strong> <strong class="box-header with-border">个人邮寄信息详情</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0"> <table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
<thead> <thead>
...@@ -111,6 +107,7 @@ ...@@ -111,6 +107,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div style="display: none;" > <div style="display: none;" >
<div id="div1"> <div id="div1">
...@@ -241,7 +238,6 @@ ...@@ -241,7 +238,6 @@
</tr> </tr>
</table> </table>
</div> </div>
<div id="div3"> <div id="div3">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family: '黑体';"> <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family: '黑体';">
<tr> <tr>
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 900180b0
<!--<style>-->
<!--.table th, .table td {-->
<!--text-align: center;-->
<!--vertical-align: middle!important;-->
<!--}-->
<!--.ul li{-->
<!--cursor: pointer;-->
<!--}-->
<!--.page-list .pagination {float:left;}-->
<!--.page-list .pagination span {cursor: pointer;}-->
<!--.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}-->
<!--.page-list .pagination .separate span:hover {background: none;}-->
<!--.page-list .page-total {float:left; margin: 25px 20px;}-->
<!--.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}-->
<!--.page-list .page-total input {width: 40px; padding-left:3px;}-->
<!--.page-list .page-total select {width: 50px;}-->
<!--.page-list:after {-->
<!--display: block;-->
<!--clear: both;-->
<!--content: ""-->
<!--}-->
<!--.page-list{-->
<!--zoom: 1-->
<!--}-->
<!--</style>-->
<style> <style>
.table th, .table td { form input{
text-align: center; border:0;
vertical-align: middle!important; color:black;
} font-weight: bold;
.ul li{ margin-left: 10px;
cursor: pointer; }
} .postTable th, .postTable td {
.page-list .pagination {float:left;} text-align: center;
.page-list .pagination span {cursor: pointer;} vertical-align: middle!important;
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;} }
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <section class="content">
<h4> <div class="col-md-12 no-padding" style="margin-top:20px;">
打印封条 <div class="box box-primary ">
</h4> <div class="box-header with-border">
</section> <strong >封条标签</strong>
<div style="padding: 15px;"> </div>
<div class="box box-primary"> <div class="box-info" style="padding: 15px;padding-top: 0;">
<strong class="box-header"></strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td width="10%">身份证号:</td> <td width="10%">身份证号:</td>
...@@ -45,89 +56,116 @@ ...@@ -45,89 +56,116 @@
</td> </td>
</tr> </tr>
</table> </table>
<div class="row"> </div>
<div class="col-lg-5" > </div>
</div>
<div class="col-lg-12"> <div class="col-md-12 box no-padding">
<table class="table table-bordered table-hover postTable "> <div class=" box-default">
<thead> <div class="box-header with-border">
<tr> <strong >详情信息</strong>
<th>NO.</th> </div>
<th>派出所代码</th> <div class="box-body no-padding col-md-12">
<th>派出所名称</th> <div class="col-md-5" style="padding-right: 0px;" >
<th>数量</th> <table class="table table-bordered table-hover postTable ">
<th>状态</th> <thead>
</tr> <tr>
</thead> <th>NO.</th>
<tbody> <th>派出所代码</th>
<tr ng-click="showDetail(1)"> <th>派出所名称</th>
<td>1</td> <th>数量</th>
<td>110021</td> <th>打印卸载</th>
<td>东城派出所</td> <th>电质检</th>
<td>2</td> <th>状态</th>
<td></td> </tr>
</tr> </thead>
<tr ng-click="showDetail(2)"> <tbody>
<td>2</td> <tr ng-click="showDetail(1)">
<td>110021</td> <td>1</td>
<td>东城派出所</td> <td>110021</td>
<td>3</td> <td>东城派出所</td>
<td>复核一致</td> <td>2</td>
</tr> <td>2</td>
<tr ng-repeat="item in postMsgDetail"> <td>0</td>
<td> <td></td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked"> </tr>
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)"> <tr ng-click="showDetail(2)">
</td> <td>2</td>
<td>{{item.id}}</td> <td>110021</td>
<td>{{item.ddh}}</td> <td>东城派出所</td>
<td>{{item.yjh}}</td> <td>3</td>
<td>{{item.fxyjh}}</td> <td>3</td>
<td>{{item.sbsll}}</td> <td>3</td>
<td>{{item.sjrxm}}</td> <td></td>
<td>{{item.sjrlxfs}}</td> </tr>
<td>{{item.sjrdz}}</td> <tr ng-repeat="item in postMsgDetail">
<td>{{item.sqrxm}}</td> <td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td> <input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
</tr> <input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
</tbody> <td>{{item.id}}</td>
</table> <td>{{item.ddh}}</td>
</div> <td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</div> </tbody>
<div class="col-lg-7" style="padding-left: 0;" ng-if="policeCardsList"> </table>
<table class="table table-bordered">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>签发机关</th>
<th>打印标记</th>
<th>电写标记</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeCardsList">
<td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.username}}</td>
<td>{{item.idCard}}</td>
<td>{{item.qfjg}}</td>
<td>
<span ng-if="item.isPrint==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isPrint==0" style="color:lightseagreen;size: 6px">√</span>
</td>
<td><span ng-if="item.isEwrite==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isEwrite==0" style="color:lightseagreen;size: 6px">√</span>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
<div class="col-md-7" style="" ng-if="policeCardsList">
<table class="table table-bordered">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>签发机关</th>
<th>打印标记</th>
<th>电写标记</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeCardsList">
<td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.username}}</td>
<td>{{item.idCard}}</td>
<td>{{item.qfjg}}</td>
<td>
<span ng-if="item.isPrint==1"
style="color: red"
class="glyphicon glyphicon-remove">
</span>
<span ng-if="item.isPrint==0"
style="size: 6px">2019-03-04 19:14</span>
</td>
<td>
<span ng-if="item.isEwrite==1"
style="color: red"
class="glyphicon glyphicon-remove">
</span>
<span ng-if="item.isEwrite==0"
style="size: 6px">2019-03-04 19:14</span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="box-footer clearfix">
<button class="btn btn-success pull-right "
style="margin-right: 20px;">复核一致
</button>
<button class="btn btn-info pull-right"
style="margin-right: 20px;">打印标签
</button>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file </section>
\ No newline at end of file
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
...@@ -81,5 +77,6 @@ ...@@ -81,5 +77,6 @@
<!-- /.col --> <!-- /.col -->
</div> </div>
<!-- /.row --> <!-- /.row -->
</section> </div>
</div>
src/main/resources/static/views/task/taskListPrint.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
...@@ -92,5 +88,6 @@ ...@@ -92,5 +88,6 @@
<!-- /.col --> <!-- /.col -->
</div> </div>
<!-- /.row --> <!-- /.row -->
</section> </div>
</div>
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<strong>任务单详情</strong> <strong>任务单详情</strong>
...@@ -84,7 +77,7 @@ ...@@ -84,7 +77,7 @@
<!-- /. box --> <!-- /. box -->
</div> </div>
<!-- /.col --> <!-- /.col -->
</div>
<!-- /.row --> <!-- /.row -->
</section> </div>
src/main/resources/static/views/task/taskListSorting.html
View file @ 900180b0
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
...@@ -78,9 +72,8 @@ ...@@ -78,9 +72,8 @@
</div> </div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
</div>
<!-- /.col --> <!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 900180b0
...@@ -27,13 +27,10 @@ ...@@ -27,13 +27,10 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
邮政信息查询 <div class="box box-primary" >
</h4> <strong class="box-header">快递单信息管理</strong>
</section>
<div style="padding: 15px;">
<div class="box box-primary" style="padding: 15px;margin-bottom: 10px;">
<div class="box-info"> <div class="box-info">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
...@@ -87,7 +84,9 @@ ...@@ -87,7 +84,9 @@
</div> </div>
</div> </div>
<div class="box box-default"> <div class="box box-default">
<div class="box-header">邮寄单详情(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共{{paginationConf.totalItems}}条</span>)</div> <div class="box-header with-border"><strong>邮寄单详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="postData.length>0"> <table class="table table-bordered table-hover" ng-if="postData.length>0">
<thead> <thead>
...@@ -123,4 +122,5 @@ ...@@ -123,4 +122,5 @@
<h3 ng-if="postData.length==0">暂无记录。</h3> <h3 ng-if="postData.length==0">暂无记录。</h3>
</div> </div>
</div> </div>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ 900180b0
...@@ -27,18 +27,14 @@ ...@@ -27,18 +27,14 @@
zoom: 1 zoom: 1
} }
</style> </style>
<section class="content-header" style="padding-top: 1px;"> <div class="content row">
<h4> <div class="col-md-12" style="margin-top:20px;">
制证包管理
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">制证包上传</strong> <strong class="box-header with-border">制证包上传</strong>
<div class="box-primary"> <div class="box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td width="10%">选择xml文件：</td> <td width="15%">选择XML文件：</td>
<td colspan="2" width="35%"> <td colspan="2" width="35%">
<input type="file" <input type="file"
id="id_file_photo_for_check" id="id_file_photo_for_check"
...@@ -53,12 +49,12 @@ ...@@ -53,12 +49,12 @@
</div> </div>
</div> </div>
<div class="box box-primary"> <div class="box box-primary">
<strong class="box-header">制证包管理</strong> <strong class="box-header with-border ">制证包管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;"> <div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>Xml导入时间:</td> <td width="15%">XML导入时间:</td>
<td> <td colspan="2" width="35%">
<div class="input-group date" style="width: 65%"> <div class="input-group date" style="width: 65%">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
...@@ -66,17 +62,7 @@ ...@@ -66,17 +62,7 @@
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div> </div>
</td> </td>
<td> <td style="text-align: left;">
状态
</td>
<td>
<select class="form-control select2" id="state" ng-model="state">
<option value="">--请选择解析状态--</option>
<option value="1">已解析</option>
<option value="-1">未解析</option>
</select>
</td>
<td>
<button class="btn btn-primary" ng-click="getXmlPackage()">查询</button> <button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
</td> </td>
</tr> </tr>
...@@ -102,7 +88,7 @@ ...@@ -102,7 +88,7 @@
<td>{{item.commonCardCount}}</td> <td>{{item.commonCardCount}}</td>
<td>{{item.postCardCount}}</td> <td>{{item.postCardCount}}</td>
<td> <td>
<button class="btn btn-primary" ng-click="analysis()">解析</button> <button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount)">解析</button>
<button class="btn btn-danger">删除</button> <button class="btn btn-danger">删除</button>
</td> </td>
</tr> </tr>
...@@ -121,4 +107,4 @@ ...@@ -121,4 +107,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 900180b0
...@@ -30,22 +30,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -30,22 +30,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.analysis = function () {
$scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/alert.html' + urlTimeStamp(), template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 600, width: 876,
cache: false, cache: false,
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.msgText = "弹出框" $scope.upDate =uploadDate;
$scope.upCount=packageCount;
}] }]
}); });
} }
$scope.uploadXml = function () { $scope.uploadXml = function () {
...@@ -65,13 +63,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -65,13 +63,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
} }
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getXmlPackage = function(){ $scope.getXmlPackage = function(){
console.log($("#datepicker").val(),$scope.state) console.log($("#datepicker").val())
HttpService.selectXmlPackage($("#datepicker").val(),$scope.state,function(data){ HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){
$scope.paginationConf.totalItems = 50;
})
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.xmlPackageData = data; $scope.xmlPackageData = data;
console.log($scope.xmlPackageData) console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
}); });
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