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

src/main/java/com/yxproject/start/api/AdminApi.java

@@ -237,7 +237,6 @@ public class AdminApi {
         String str = "0";
         SysPermission sysPermission = new SysPermission();
         sysPermission.setName(jsonObject.getString("name"));
-        sysPermission.setResource_type(jsonObject.getString("resourceType"));
         sysPermission.setUrl(jsonObject.getString("url"));
         sysPermission.setPermission(jsonObject.getString("permission"));
 //        sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
@@ -335,6 +334,7 @@ public class AdminApi {
         SysRole sysRole = new SysRole();
         sysRole.setRole(jsonObject.getString("role"));
         sysRole.setDescription(jsonObject.getString("description"));
+        sysRole.setProcess(Integer.parseInt(jsonObject.getString("process")));
         String permissionIds = jsonObject.getString("permissionIds");
 
         JSONArray jsonArray = JSONArray.fromObject(permissionIds);
@@ -402,19 +402,11 @@ public class AdminApi {
         JSONObject jsonObject = JSONObject.fromObject(jsonStr);
         Map<String, String> map = new HashMap<>();
         boolean flag = false;
-//        String str = "0";
         SysPermission sysPermission = new SysPermission();
         sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
         sysPermission.setName(jsonObject.getString("name"));
-        sysPermission.setResource_type(jsonObject.getString("resourceType"));
         sysPermission.setUrl(jsonObject.getString("url"));
         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);
         flag = sysPermissionService.updatePermission(sysPermission);
         if (flag) {
@@ -426,4 +418,4 @@ public class AdminApi {
         return map;
 
     }
- }
+}

src/main/java/com/yxproject/start/api/FilesAnalysisApi.java

@@ -13,7 +13,7 @@ public class FilesAnalysisApi {
     private  PersonPostService personPostService;
 
     /**
-     * 文件解析
+     * 文件解析 修改解析状态
      * @param fileId
      * @param creatTime
      * @return

src/main/java/com/yxproject/start/api/ReadExcelApi.java

@@ -9,9 +9,11 @@ import com.yxproject.start.utils.YXJSONResponse;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -45,7 +47,7 @@ public class ReadExcelApi {
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Produces(MediaType.APPLICATION_JSON)
     @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();
         resp.setCharacterEncoding("UTF-8");
         String filename = "";
@@ -92,18 +94,16 @@ public class ReadExcelApi {
                             } catch (IOException e) {
                                 e.printStackTrace();
                             }
-
-//                            CommonsMultipartFile  cf= (CommonsMultipartFile)item;
-//                            DiskFileItem fi = (DiskFileItem)cf.getFileItem();
-//                            File file = fi.getStoreLocation();
                             ReadExcel readExcel = new ReadExcel();
                             List list1 = readExcel.readExcel(file);
                             //保存EXCEL文件信息
                             FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
                             fileNameDicEntity.setFileName(filename);
                             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<>();
                             for (int i = 0; i < list1.size(); i++) {
                                 PersonPostEntity personPostEntity = new PersonPostEntity();
@@ -136,11 +136,10 @@ public class ReadExcelApi {
                                 personPostEntity.setNatureOfTheInternal((String) list2.get(21));
                                 personPostEntity.setNatureOfTheInformation((String) list2.get(22));
                                 personPostEntity.setFirstWhite((String) list2.get(23));
+                                personPostEntity.setFileId(l);
                                 entityList.add(personPostEntity);
                             }
                             personPostService.savePersonPost(entityList);
-
-
                         } catch (Exception e) {
                             e.printStackTrace();
                             yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
@@ -164,4 +163,43 @@ public class ReadExcelApi {
         }
         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

 package com.yxproject.start.api;
 
+import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
 import com.yxproject.start.entity.PreproPersonEntity;
 import com.yxproject.start.service.ImportXmlService;
@@ -13,6 +14,7 @@ import org.dom4j.DocumentException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -122,5 +124,38 @@ public class ReadXmlApi {
         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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.service.TaskListService;
+import com.yxproject.start.utils.YXJSONResponse;
 import net.sf.json.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -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

@@ -8,6 +8,7 @@ public class CountDataEntity {
     private Integer cardCount;
     private Integer commonCardCount;
     private Integer postCardCount;
+    private long state;
 
     public String getUploadDate() {
         return uploadDate;
@@ -48,4 +49,13 @@ public class CountDataEntity {
     public void setPostCardCount(Integer 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

@@ -12,7 +12,7 @@ public class FilesEntity {
     private String dwdm;
     private String dwmc;
     private Long recordNumber;
-    private String creatTime;
+    private String createTime;
     private String sourceFileName;
     private Date newTime;
 
@@ -57,13 +57,13 @@ public class FilesEntity {
     }
 
     @Basic
-    @Column(name = "CREAT_TIME")
-    public String getCreatTime() {
-        return creatTime;
+    @Column(name = "CREATE_TIME")
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setCreatTime(String creatTime) {
-        this.creatTime = creatTime;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
     @Id
@@ -95,13 +95,13 @@ public class FilesEntity {
                 Objects.equals(dwdm, that.dwdm) &&
                 Objects.equals(dwmc, that.dwmc) &&
                 Objects.equals(recordNumber, that.recordNumber) &&
-                Objects.equals(creatTime, that.creatTime) &&
+                Objects.equals(createTime, that.createTime) &&
                 Objects.equals(sourceFileName, that.sourceFileName) &&
                 Objects.equals(newTime, that.newTime);
     }
 
     @Override
     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

+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

@@ -3,6 +3,10 @@ package com.yxproject.start.entity;
 import javax.persistence.*;
 import java.util.Objects;
 
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   20:09
+ */
 @Entity
 @Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
 public class PreproPersonEntity {
@@ -30,9 +34,9 @@ public class PreproPersonEntity {
     private String sjrYzbm;
     private String sjrTxdz;
     private String sid;
-    private String fileName;
+    private Long fileId;
     private Long cardTypeId;
-    private String newFileName;
+    private Long newFileId;
     private Long state;
 
     @Id
@@ -276,13 +280,13 @@ public class PreproPersonEntity {
     }
 
     @Basic
-    @Column(name = "FILE_NAME")
-    public String getFileName() {
-        return fileName;
+    @Column(name = "FILE_ID")
+    public Long getFileId() {
+        return fileId;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
+    public void setFileId(Long fileId) {
+        this.fileId = fileId;
     }
 
     @Basic
@@ -296,13 +300,13 @@ public class PreproPersonEntity {
     }
 
     @Basic
-    @Column(name = "NEW_FILE_NAME")
-    public String getNewFileName() {
-        return newFileName;
+    @Column(name = "NEW_FILE_ID")
+    public Long getNewFileId() {
+        return newFileId;
     }
 
-    public void setNewFileName(String newFileName) {
-        this.newFileName = newFileName;
+    public void setNewFileId(Long newFileId) {
+        this.newFileId = newFileId;
     }
 
     @Basic
@@ -344,14 +348,14 @@ public class PreproPersonEntity {
                 Objects.equals(sjrYzbm, that.sjrYzbm) &&
                 Objects.equals(sjrTxdz, that.sjrTxdz) &&
                 Objects.equals(sid, that.sid) &&
-                Objects.equals(fileName, that.fileName) &&
+                Objects.equals(fileId, that.fileId) &&
                 Objects.equals(cardTypeId, that.cardTypeId) &&
-                Objects.equals(newFileName, that.newFileName) &&
+                Objects.equals(newFileId, that.newFileId) &&
                 Objects.equals(state, that.state);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileName, cardTypeId, newFileName, state);
+        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
     }
 }

src/main/java/com/yxproject/start/entity/SysPermission.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="SYS_PERMISSION")
@@ -20,10 +20,7 @@ public class SysPermission implements Serializable {
      * 名称.
      */
     private String name;
-    /**
-     * 资源类型
-     */
-    private String resource_type;
+
     /**
      * 资源路径.
      */
@@ -33,19 +30,6 @@ public class SysPermission implements Serializable {
      */
     private String permission;
 
-
-
-    /**
-     * 父编号
-     */
-    private Long parent_id;
-
-
-
-    /**
-     * 父编号列表
-     */
-    private String parent_ids;
     private byte available = 0;
     @ManyToMany
     @JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")})
@@ -67,22 +51,6 @@ public class SysPermission implements Serializable {
         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() {
         return url;
     }
@@ -99,16 +67,6 @@ public class SysPermission implements Serializable {
         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() {
         return available;
     }

src/main/java/com/yxproject/start/entity/SysRole.java

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="SYS_ROLE")
@@ -17,7 +17,7 @@ public class SysRole {
     private Integer id;
     /**
      * 角色标识程序中判断使用,如"admin",这个是唯一的:
-      */
+     */
     private String role;
     /**
      *  角色描述,UI界面显示使用
@@ -28,6 +28,8 @@ public class SysRole {
      */
     private byte available = 0;
 
+    private Integer process;
+
     /**
      * 角色 -- 权限关系：多对多关系;
      */
@@ -37,13 +39,13 @@ public class SysRole {
 
     /**
      * 用户 - 角色关系定义;
-      */
+     */
 
     @ManyToMany
     @JoinTable(name="SysUserRole",joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="userId")})
     /**
      * 一个角色对应多个用户
-      */
+     */
 
     private List<UserInfo> userInfos;
 
@@ -94,4 +96,12 @@ public class SysRole {
     public void setUserInfos(List<UserInfo> 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

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class CountCountyEntity {
     private String countyName;
     private Integer countyCount;

src/main/java/com/yxproject/start/entity/TaskList/CountGajgEntity.java

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class CountGajgEntity {
     private String gajgName;
     private Integer gajgCount;

src/main/java/com/yxproject/start/entity/TaskList/TaskListEntity.java

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class    TaskListEntity {
     private String countyName;
     private String gajgName;

src/main/java/com/yxproject/start/entity/UserInfo.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="USER_INFO")
@@ -19,7 +19,6 @@ public class UserInfo implements Serializable {
     private String password;
     private String salt;
     private byte state;
-    private String workshop;
     @ManyToMany(fetch= FetchType.EAGER)
     @JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
     private List<SysRole> roleList;
@@ -80,11 +79,4 @@ public class UserInfo implements Serializable {
         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

@@ -2,6 +2,10 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.FileNameDicEntity;
 import org.apache.ibatis.annotations.*;
+import org.hibernate.validator.constraints.SafeHtml;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * @auther zhangyusheng
@@ -9,11 +13,64 @@ import org.apache.ibatis.annotations.*;
  */
 @Mapper
 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")
     public long saveFileNameDic(FileNameDicEntity fileNameDicEntity);
 
-
+    /**
+     * 更新个人邮寄字典表的解析状态
+     * 更新为已解析
+     * @param fileId 文件ID
+     * @return
+     */
     @Update("Updata FILE_NAME_DIC.STATE = 1 WHERE FILE_ID = #{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

@@ -2,21 +2,53 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
 @Mapper
 public interface FilesMapper {
 
-    @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" +
-            "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})")
-    public boolean insertFiles(FilesEntity filesEntity);
+    @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME)" +
+            "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName})")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
+    public long insertFiles(FilesEntity filesEntity);
 
 
-    @Select("")
-    public List<CountDataEntity> selectFilesCount();
+    @Select("<script> " +
+            "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

+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

@@ -24,23 +24,42 @@ public interface PreproPersonMapper {
 
 
     /*按条件查询制证数据*/
-    @Select("select * from PREPRO_PERSON \n" +
-            "left join files on PREPRO_PERSON.FILE_ID = files.ID\n" +
-            "left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
-            "where 1=1 " +
-            " <where>" +
-            " <if test='uploadNo != null'> and PREPRO_PERSON.JMSFZSLH = #{uploadNo} </if>" +
-            " <if test='IDCard != null'> and GMSFHM = #{IDCard} </if> " +
-            " <if test='oldFile != null'> and files.SOURCE_FILE_NAME =#{oldFile}  </if> " +
-            " <if test='newFile != null'> and  NEW_FILES.NEW_FILE_NAME = #{newFile} </if> " +
-            " <if test='SSXQDM != null'> and PREPRO_PERSON.SSXQDM =#{SSXQDM} </if>   " +
-            " <if test='cardType != null'> and PREPRO_PERSON.CARD_TYPE_ID =#{cardType} </if> " +
-            " <if test='state != null'> and  PREPRO_PERSON.state = #{state} </if>  " +
-            " <if test='uploadDate != null'> and files.CREAT_TIME = #{uploadDate} </if> " +
-            " </where>")
+    @Select({"<script>"+
+            "select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID "+
+            "<where> " +
+            " 1=1" +
+                    "<if test='uploadNo != null '>"+
+                    "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
+                    "</if>"+
+                " <if test='IDCard != null '> ",
+                "and GMSFHM = #{IDCard} ",
+                "</if> " ,
+                " <if test='oldFile != null '> ",
+                "and files.SOURCE_FILE_NAME =#{oldFile} ",
+                " </if> " ,
+                " <if test='newFile != null'> ",
+                "and  NEW_FILES.NEW_FILE_NAME = #{newFile}",
+                " </if> " ,
+                " <if test='SSXQDM != null '> ",
+                "and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
+                " </if>" ,
+                " <if test='cardType != null  '>",
+                " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
+                " </if> " ,
+                " <if test='state != null'>",
+                " and  PREPRO_PERSON.state = #{state}",
+                " </if>  " ,
+                " <if test='uploadDate != null '>",
+                " and files.CREAT_TIME = #{uploadDate}",
+                " </if> ",
+            "</where>"+
+            "</script>"})
     public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate);
 
     /*修改标记制证数据状态*/
     @Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
     public boolean updateState (@Param("state")String state, @Param("acceptNo") String acceptNo);
+
+    @Update("UPDATE PREPRO_PERSON  SET NEW_FILE_ID=#{newFileId} where JMSFZSLH=#{jmsfzslh}")
+    public  boolean updateNewFileName(PreproPersonEntity personEntity);
 }
\ No newline at end of file

src/main/java/com/yxproject/start/mapper/QuerySequenceMapper.java

 package com.yxproject.start.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -9,6 +10,6 @@ import org.apache.ibatis.annotations.Select;
  */
 @Mapper
 public interface QuerySequenceMapper {
-    @Select("select #{sequenceName} from dual")
-    public String selectSequenceNextValue(String sequenceName);
+    @Select("select #{sequenceName},#{sequenceName} as num2 from dual")
+    public Object[] selectSequenceNextValue(@Param("sequenceName") String sequenceName);
 }

src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java

@@ -2,8 +2,10 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.SysPermission;
 import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator
@@ -14,8 +16,8 @@ public interface SysPermissionMapper{
      * 新增权限
      * @param sysPermission
      */
-    @Insert("INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n" +
-            "VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},#{url})")
+    @Insert("INSERT INTO sys_permission (id,available,name,permission,url)\n" +
+            "VALUES (PERMISSION_seq.nextval,0,#{name},#{permission},#{url})")
     public void addPermissionByMap(SysPermission sysPermission);
 
     /**
@@ -74,7 +76,7 @@ public interface SysPermissionMapper{
      * 修改权限信息
      * @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}")
     public void updatePermission(SysPermission sysPermission);
 }

src/main/java/com/yxproject/start/mapper/SysRoleMapper.java

@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.SysRole;
 import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -14,8 +15,8 @@ public interface SysRoleMapper {
      * 添加角色
      * @param sysRole
      */
-    @Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE)\n" +
-            "VALUES(PERMISSION_seq.nextval,0,#{description},#{role})")
+    @Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE,PROCESS)\n" +
+            "VALUES(PERMISSION_seq.nextval,0,#{description},#{role},#{process})")
     @Options(useGeneratedKeys = true, keyProperty = "id",keyColumn = "id")
     public void addRoleByMap(SysRole sysRole);
 
@@ -36,6 +37,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     public List<SysRole> selectAllRole();
@@ -65,6 +67,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     List<SysRole> selectRoleAndPermissionByUserId(@Param("userId") Integer userId);
@@ -102,6 +105,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     public SysRole selectRoleByRoleId(@Param("roleId") Integer roleId);

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskList.TaskListEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator
@@ -27,6 +28,20 @@ public interface TaskListMapper {
             "   GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)")
     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 {
     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

@@ -2,10 +2,34 @@ package com.yxproject.start.service;
 
 import com.yxproject.start.entity.FileNameDicEntity;
 
+import java.util.List;
+
 /**
  * @auther zhangyusheng
  * 2019/3/1   10:42
  */
 public interface FileNameDicService {
+    /**
+     * 保存个人邮寄信息字典表
+     * @param fileNameDicEntity
+     * @return
+     */
     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

 package com.yxproject.start.service;
 
 
+import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
 import com.yxproject.start.entity.PreproPersonEntity;
 
@@ -12,4 +13,7 @@ import java.util.List;
 public interface ImportXmlService {
 
     public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity);
+
+    public List<CountDataEntity> queryPersonXml(String importDate, long maxNum, long minNum);
+    public int queryPersonXmlCount(String importDate);
 }

src/main/java/com/yxproject/start/service/NewFilesService.java

+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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.FileNameDicEntity;
 import com.yxproject.start.entity.PersonPostEntity;
 
 import java.util.Date;
@@ -12,7 +13,7 @@ import java.util.List;
 public interface PersonPostService {
 
     /**
-     * 解析制证包
+     * 文件解析 修改解析状态
      * @param fileId
      * @param creatTime
      * @return

src/main/java/com/yxproject/start/service/PreproPersonService.java

@@ -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 boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities);
 }

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -18,4 +18,6 @@ public interface TaskListService {
     public boolean createTaskList(List<TaskListEntity> resultMap);
 
     public boolean updateState(String taskId);
+
+    public List<Object> selectByCountyAtACCU(String date);
 }

src/main/java/com/yxproject/start/service/impl/FileNameDicServiceImpl.java

@@ -6,6 +6,8 @@ import com.yxproject.start.service.FileNameDicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @auther zhangyusheng
  * 2019/3/1   10:43
@@ -20,4 +22,16 @@ public class FileNameDicServiceImpl implements FileNameDicService {
         long fileId = fileNameDicMapper.saveFileNameDic(fileNameDicEntity);
         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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
 import com.yxproject.start.entity.PreproPersonEntity;
 import com.yxproject.start.mapper.FilesMapper;
@@ -21,17 +22,33 @@ public class ImportXmlServiceImpl implements ImportXmlService {
     @Autowired
     private FilesMapper filesMapper;
 
+    /**
+     *
+     * @param preproPersonEntities
+     * @param filesEntity
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity) {
-
-        filesMapper.insertFiles(filesEntity);
-        for (PreproPersonEntity preproPersonEntity:preproPersonEntities){
-            System.out.println(preproPersonEntity.getJmsfzslh()+"___________");
-             preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
+    public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities, FilesEntity filesEntity) {
+        long l = filesMapper.insertFiles(filesEntity);
+        for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
+            preproPersonEntity.setFileId(l);
+            preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
         }
         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

+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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.FileNameDicEntity;
 import com.yxproject.start.entity.PersonPostEntity;
 import com.yxproject.start.mapper.FileNameDicMapper;
 import com.yxproject.start.mapper.PersonPostMapper;
@@ -34,6 +35,12 @@ public class PersonPostServiceImpl implements PersonPostService {
         return true;
     }
 
+    /**
+     * 文件解析 修改解析状态
+     * @param fileId
+     * @param creatTime
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateIsPost(String fileId, String creatTime) {
@@ -41,7 +48,7 @@ public class PersonPostServiceImpl implements PersonPostService {
         personPostMapper.updateIsPost(fileId,creatTime);
         return true;
     }
-
+    //TODO
     @Override
     public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
         String str = null;
@@ -62,5 +69,17 @@ public class PersonPostServiceImpl implements PersonPostService {
         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

@@ -24,7 +24,29 @@ public class PreproPersonServiceImpl implements PreproPersonService {
     }
     @Override
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
-        List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(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;
     }
+    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

@@ -5,10 +5,15 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.mapper.TaskListMapper;
 import com.yxproject.start.service.TaskListService;
+import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.jws.Oneway;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class TaskListServiceImpl implements TaskListService {
@@ -44,4 +49,22 @@ public class TaskListServiceImpl implements TaskListService {
         taskListMapper.updateState(taskId);
         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

-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

 package com.yxproject.start.utils;
 
-//import com.yingxin.hibernate.domain.ProductionEntity;
 import com.yxproject.start.entity.FilesEntity;
 import com.yxproject.start.entity.PreproPersonEntity;
 import org.dom4j.Document;
@@ -41,7 +40,7 @@ public class IDCardFactory {
             filesEntity.setDwmc(DWMC);
             Date date = new Date();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-            filesEntity.setCreatTime(simpleDateFormat.format(date));
+            filesEntity.setCreateTime(simpleDateFormat.format(date));
 
             List<Element> recordlist = records.elements("RECORD");
             for (Element e : recordlist) {
@@ -70,6 +69,7 @@ public class IDCardFactory {
                 preproPersonEntity.setSjrLxdh(e.element("SJR_LXDH").getStringValue());
                 preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue());
                 preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue());
+//                preproPersonEntity.setFileId();
                 preproPersonEntityList.add(preproPersonEntity);
                 System.out.println(preproPersonEntity.getJmsfzslh()+"--------------");
             }

src/main/java/com/yxproject/start/utils/QuerySequenceSercive.java

@@ -13,8 +13,8 @@ public class QuerySequenceSercive {
     @Autowired
     private QuerySequenceMapper querySequenceMapper;
     public String selectSequenceNextValue(String sequenceName){
-        String s = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval()");
-        return s;
+        Object[] objects = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
+        return "";
 
     }
 

src/main/resources/application.yml

@@ -18,6 +18,6 @@ spring:
 mybatis:
   type-aliases-package: com.yxproject.start.entity
   #加载Mybatis配置文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations: classpath:mapper/config/*Mapper.xml
   config-location: classpath:mapper/config/mybatis-config.xml
 

src/main/resources/mapper/config/mybatis-config.xml

@@ -5,5 +5,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 <configuration>
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <setting name="logImpl" value="STDOUT_LOGGING" />
     </settings>
 </configuration>
\ No newline at end of file

src/main/resources/static/css/app.css

@@ -299,4 +299,6 @@ p {
     font-family: 'Arial Black';
     color:#000;
 }
-
+.padding10{
+    padding: 10px;
+}

src/main/resources/static/dialogs/analysisDialog.html

+<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/js/app.js

@@ -24,9 +24,9 @@ angular.module('AvatarCheck', [
     'AvatarCheck.packageLog',
     'AvatarCheck.tagPrint',
     'tm.pagination'
-]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
+]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
-    $routeProvider.otherwise({redirectTo: '/xmlAndSearch'});
+    $routeProvider.otherwise({redirectTo: '/createTaskList'});
         localStorageServiceProvider.setPrefix('AvatarCheck')
     $qProvider.errorOnUnhandledRejections(false)
 }])
@@ -37,15 +37,42 @@ angular.module('AvatarCheck', [
 
         $rootScope.loginData = localStorageService.get('loginData')
 
+
+        $scope.id = 'id';
+
         if($rootScope.loginData == null){
             $rootScope.loginData = {userid:'用户未登录', login:false};
         }
         if($rootScope.loginData.login == false){
             $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") {
             $rootScope.tab = '/excelAndSearch';
         }
@@ -118,7 +145,6 @@ angular.module('AvatarCheck', [
         }
 
 
-
         console.log($rootScope.tab)
         $scope.getFocus = function (index) {
             if(index=='/tagPrint'){

src/main/resources/static/js/service.js

@@ -173,25 +173,65 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
 
             },
-            selectXmlPackage:function(date,state,success){
+            selectXmlPackageCount:function(date,success){
                 $http({
                     method: 'GET',
-                    url: "../selectXMLApi/selectXml"+urlTimeStamp(),
+                    url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
                     params:{
-                        date:date,
-                        state:state
+                        importDate:date
+                    }
+                }).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) {
                     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({
                     method: 'GET',
-                    url: "../selectExcelApi/selectExcel"+urlTimeStamp(),
+                    url: "../ReadExcel/queryPersonPost"+urlTimeStamp(),
                     params:{
                         fileName:fileName,
-                        state:state
+                        analysisState:state,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage,
+                        uploadDate:date
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

src/main/resources/static/views/addFailed/addFailed.html

@@ -4,13 +4,10 @@
         vertical-align: middle!important;
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        添加废证
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
+        <strong class="box-header with-border">废证添加</strong>
         <div class="box-primary">
             <form ng-submit="createInputs()" style="padding-left: 15px;">
                 <span style="font-size:20px;">废证数量:</span>
@@ -53,4 +50,5 @@
             </div>
         </div>
     </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/addRest/addRest.html

@@ -7,13 +7,10 @@
    .cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
    .cl{zoom:1}
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        添加余证
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
+        <strong class="box-header with-border">余证添加</strong>
         <div class="box-primary">
             <form ng-submit="createInputs()" style="padding-left: 15px;">
                 <span style="font-size:20px;">余证数量:</span>
@@ -34,4 +31,5 @@
             </div>
         </div>
     </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/analysisLog/analysisLog.html

@@ -24,14 +24,10 @@
             zoom: 1
         }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        原始包解析日志
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <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;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
@@ -89,4 +85,5 @@
                 </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
+</div>

src/main/resources/static/views/cardProdPackage/cardProdPackage.html

@@ -27,12 +27,8 @@
         zoom: 1
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        制证信息打包
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">制证信息打包</strong>
         <div class="box-info">
@@ -89,7 +85,7 @@
 
     </div>
     <div class="box box-default">
-            <strong class="box-header">制证信息详情</strong>
+            <strong class="box-header with-border">制证信息详情</strong>
             <div class="box-info" style="padding: 10px;">
                 <table class="table table-bordered table-hover" ng-if="packageData">
                         <thead>
@@ -127,4 +123,5 @@
                 <h3 ng-if="postData.length==0">暂无记录。</h3>
             </div>
         </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html

@@ -27,12 +27,8 @@
         zoom: 1
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        制证包删除
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">制证信息打包</strong>
         <div class="box-info">
@@ -83,7 +79,7 @@
 
     </div>
     <div class="box box-default">
-            <strong class="box-header">查询结果</strong>
+            <strong class="box-header with-border">查询结果</strong>
             <div class="box-info" style="padding: 10px;">
                 <table class="table table-bordered table-hover" ng-if="xmlDatas">
                         <thead>
@@ -140,4 +136,5 @@
                 <h3 ng-if="postData.length==0">暂无记录。</h3>
             </div>
         </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/createTaskList/createTaskList.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-       任务单创建
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -75,4 +71,5 @@
     <!-- /.col -->
   </div>
   <!-- /.row -->
-</section>
+</div>
\ No newline at end of file
+</div>
\ No newline at end of file

src/main/resources/static/views/dispatchTask/dispatchTask.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        任务单下发
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -76,4 +72,5 @@
     <!-- /.col -->
   </div>
   <!-- /.row -->
-</section>
+</div>
\ No newline at end of file
+</div>
\ No newline at end of file

src/main/resources/static/views/excelAndSearch/excelAndSearch.html

@@ -27,12 +27,8 @@
         zoom: 1
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        邮寄信息导入
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">格口文件上传</strong>
         <div class="box-primary">
@@ -82,10 +78,22 @@
         </div>
     </div>
     <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;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <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>
                         <input type="text" class="form-control" ng-model="fileName" placeholder="文件名称">
@@ -97,7 +105,7 @@
                         <select class="form-control select2" id="state" ng-model="state">
                             <option value="">--请选择解析状态--</option>
                             <option value="1">已解析</option>
-                            <option value="-1">未解析</option>
+                            <option value="0">未解析</option>
                         </select>
                     </td>
                     <td>
@@ -144,4 +152,5 @@
         </div>
     </div>
 </div>
+</div>
 

src/main/resources/static/views/excelAndSearch/excelAndSearch.js

@@ -24,28 +24,31 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $('#datepicker1').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
-            format: 'yyyy-mm-dd',
+            format: 'yyyyMMdd',
             todayBtn: 1,
             autoclose: 1
         });
         $('#datepicker2').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
-            format: 'yyyy-mm-dd',
+            format: 'yyyyMMdd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $('#datepicker3').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyyMMdd',
             todayBtn: 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 () {
+            console.log($("#datepicker1").val())
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
             fd.append("formStartTime",$("#datepicker1").val());
@@ -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(){
-            console.log($scope.fileName,$scope.state)
-            HttpService.selectPostPackage($scope.fileName,$scope.state,function(data){
+            console.log($scope.fileName,$scope.state,$("#datepicker3").val())
+            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;
                 console.log($scope.postPackageData)
             })

src/main/resources/static/views/historyCards/historyBack.html

@@ -4,14 +4,10 @@
         vertical-align: middle!important;
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        历史回迁证
-    </h4>
-</section>
-<div style="padding: 15px;">
-    <div class="box box-primary">
-        <div class="box-primary">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="box box-primary">
+        <strong class="box-header with-border">回迁证添加</strong>
             <form style="padding-left: 15px;">
                 <span style="font-size:20px;">回迁证数量:</span>
                 <input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
@@ -55,6 +51,5 @@
                 </div>
             </div>
         </div>
-
-    </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/login/login.html

@@ -6,7 +6,7 @@
   <div class="login-box-body" style="border-radius: 4px;">
     <p class="login-box-msg">用户登录</p>
 
-    <form>
+    <form name="form">
         <div class="text-danger wrapper text-center" ng-show="authError" style="margin-bottom: 5px;">
             {{authError}}
         </div>

src/main/resources/static/views/login/login.js

@@ -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.doLogin = function(){
@@ -41,7 +77,9 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
                     $rootScope.loginData = resp.data.user;
                     $rootScope.loginData.login =true;
                     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){
                         window.location.reload();
                     }else{

src/main/resources/static/views/packageLog/packageLog.html

@@ -24,14 +24,10 @@
             zoom: 1
         }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        数据打包日志
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <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;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
@@ -95,4 +91,5 @@
                 </div>
         </div>
     </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/receitp/receitp.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        交接单
-    </h4>
-</section>
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+交接单
+</div>
+</div>
\ No newline at end of file
+

src/main/resources/static/views/searchCard/searchCard.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        <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="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">
             查询结果
         </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-heading">
@@ -95,14 +91,13 @@
                     <button class="btn btn-danger">退证</button>
                 </div>
             </div>
-
             <div class="panel panel-info">
                 <div class="panel-heading">
                     <h3 class="panel-title">
                         制证库
                     </h3>
                 </div>
-                <div class="panel-body">
+                <div class="panel-body" style="padding-bottom: 0;">
                     <table class="table table-hover table-bordered">
                         <thead>
                         <tr>
@@ -148,4 +143,5 @@
 
     </div>
 
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/searchCardMsg/searchCardMsg.html

@@ -11,14 +11,10 @@
     }
   
 </style>
-
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        邮政快递单打印
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
+        <strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
         <div class="box-info">
             <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>
@@ -62,8 +58,8 @@
              <button class="btn btn-info" ng-click="endReading()">停止读卡</button>
         </div>
     </div>
-    <div class="box box-primary">
-        <strong class="box-header">个人邮寄信息详情</strong>
+    <div class="box box-primary box-default">
+        <strong class="box-header with-border">个人邮寄信息详情</strong>
         <div class="box-info" style="padding: 10px;">
             <table class="table table-bordered table-striped postTable" ng-if="postMsgDetail.length>0">
                     <thead>
@@ -111,6 +107,7 @@
         </div>
     </div>
 </div>
+</div>
 
 <div style="display: none;" >
     <div id="div1">
@@ -241,7 +238,6 @@
     			</tr>
     		</table>
     </div>
-
     <div id="div3">
                     <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm;font-family: '黑体';">
                         <tr>

src/main/resources/static/views/task/taskListPreLocating.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        任务单
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -81,5 +77,6 @@
     <!-- /.col -->
   </div>
   <!-- /.row -->
-</section>
+</div>
+</div>
 

src/main/resources/static/views/task/taskListPrint.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        任务单
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -92,5 +88,6 @@
     <!-- /.col -->
   </div>
   <!-- /.row -->
-</section>
+</div>
+</div>
 

src/main/resources/static/views/task/taskListQualityCheck.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        任务单
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
-  <div class="row">
-    <!-- /.col -->
-    <div class="col-md-12">
+<div class="content row">
+      <div class="col-md-12" style="margin-top:20px;">
       <div class="box box-primary">
         <div class="box-header with-border">
           <strong>任务单详情</strong>
@@ -84,7 +77,7 @@
       <!-- /. box -->
     </div>
     <!-- /.col -->
-  </div>
   <!-- /.row -->
-</section>
+  </div>
+
 

src/main/resources/static/views/task/taskListSorting.html

-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        任务单
-    </h4>
-</section>
-<section class="content" style="padding: 15px;">
-  <div class="row">
+<div class="content row">
     <!-- /.col -->
-    <div class="col-md-12">
-      <div class="box box-primary">
+    <div class="col-md-12" style="margin-top:20px;">
+<div class="box box-primary">
         <div class="box-header with-border">
           <strong>任务单详情</strong>
           <div class="box-tools pull-right">
@@ -78,9 +72,8 @@
         </div>
       </div>
       <!-- /. box -->
-    </div>
+</div>
+</div>
     <!-- /.col -->
-  </div>
-  <!-- /.row -->
-</section>
+
 

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html

@@ -27,13 +27,10 @@
         zoom: 1
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        邮政信息查询
-    </h4>
-</section>
-<div style="padding: 15px;">
-    <div class="box box-primary" style="padding: 15px;margin-bottom: 10px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+    <div class="box box-primary" >
+        <strong class="box-header">快递单信息管理</strong>
         <div class="box-info">
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
@@ -87,7 +84,9 @@
         </div>
     </div>
     <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;">
                 <table class="table table-bordered table-hover" ng-if="postData.length>0">
                         <thead>
@@ -123,4 +122,5 @@
                 <h3 ng-if="postData.length==0">暂无记录。</h3>
             </div>
         </div>
+</div>
 </div>
\ No newline at end of file

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html

@@ -27,18 +27,14 @@
         zoom: 1
     }
 </style>
-<section class="content-header" style="padding-top: 1px;">
-    <h4>
-        制证包管理
-    </h4>
-</section>
-<div style="padding: 15px;">
+<div class="content row">
+<div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
-        <strong class="box-header">制证包上传</strong>
+        <strong class="box-header with-border">制证包上传</strong>
         <div class="box-primary">
              <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
-                    <td width="10%">选择xml文件：</td>
+                    <td width="15%">选择XML文件：</td>
                     <td colspan="2" width="35%">
                          <input type="file"
                                 id="id_file_photo_for_check"
@@ -53,12 +49,12 @@
         </div>
     </div>
     <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;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
-                   <td>Xml导入时间:</td>
-                   <td>
+                   <td width="15%">XML导入时间:</td>
+                   <td colspan="2" width="35%">
                          <div class="input-group date" style="width: 65%">
                                <div class="input-group-addon">
                                  <i class="fa fa-calendar"></i>
@@ -66,17 +62,7 @@
                                <input type="text"  class="form-control pull-right" ng-model="choseDate" id="datepicker"  readonly/>
                          </div>
                    </td>
-                    <td>
-                        状态
-                    </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>
+                    <td style="text-align: left;">
                          <button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
                     </td>
               </tr>
@@ -102,7 +88,7 @@
                         <td>{{item.commonCardCount}}</td>
                         <td>{{item.postCardCount}}</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>
                         </td>
                     </tr>
@@ -121,4 +107,4 @@
         </div>
     </div>
 </div>
-
+</div>

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js

@@ -30,22 +30,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
         
         $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({
-                template: 'dialogs/alert.html' + urlTimeStamp(),
-                width: 600,
+                template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
+                width: 876,
                 cache: false,
                 controller: ['$scope', function ($scope) {
-                    $scope.msgText = "弹出框"
+                    $scope.upDate =uploadDate;
+                    $scope.upCount=packageCount;
                 }]
             });
+
         }
 
         $scope.uploadXml = function () {
@@ -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(){
-            console.log($("#datepicker").val(),$scope.state)
-            HttpService.selectXmlPackage($("#datepicker").val(),$scope.state,function(data){
+            console.log($("#datepicker").val())
+            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;
-                console.log($scope.xmlPackageData)
+                console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
             })
         }
 
+
+        // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
+
+
     });