diff --git a/pom.xml b/pom.xml
index 9646d4272745028599c492aa87f95079b22aa038..c63fed58314d590f4469c597961c131447774d59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,7 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-cas</artifactId>
             <version>1.2.6</version>
+
         </dependency>
         <!--<dependency>
             <groupId>com.github.theborakompanioni</groupId>
@@ -189,6 +190,13 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
             <version>1.8.7</version>
         </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
diff --git a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
index 2917b3eaa42334ced35dddbb9fd628be72e8817d..7d716d7dcd1ab2dc8216eb89507d377b8e5c0a3e 100644
--- a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
+++ b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletResponse;
  * @date: 2020/9/11 10:55
  * 更改描述：2020/9/13加上 subject.isRemembered()，让它同时也兼容remember这种情况。
  */
-public class FormFilter extends FormAuthenticationFilter {
+public class  FormFilter extends FormAuthenticationFilter {
 
     /**
      * 指定缓存失效时间
diff --git a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
index 00de9facb7ea6ec39c4fa264e586b8abec3af85f..85fc6a8837fb2d31a47315238d0e6fa812068b9a 100644
--- a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
+++ b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
@@ -31,7 +31,7 @@ import java.io.IOException;
  * @version: 1.0
  * @date: 2020/9/11 10:55
  */
-@RestControllerAdvice
+//@RestControllerAdvice
 public class GlobalExceptionHandler {
 
 
diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index b8477b38429b74c5c515508c49de790e33d5ecd1..b0a6f4acd23ff08837db44bf094961a484d16297 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -29,7 +29,6 @@ public class PageDataResult {
 
     private List<? extends NumberS> list;
 
-    public PageDataResult(){};
     public PageDataResult(int totals,List<? extends NumberS> list){
         this.totals=totals;
         this.list=list;
@@ -43,6 +42,10 @@ public class PageDataResult {
         }
     }
 
+    public PageDataResult() {
+
+    }
+
     public Integer getCode() {
         return code;
     }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
index e598c2ccca9b3e1c3d4b19e36a5b9928cddedb92..d93f34fbfbe2e6f8c4b06a0cf769bb305315b659 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -10,7 +10,6 @@ package com.cetc32.dh.controller.rest;
 
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataFile;
-import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
index 3f9692c678234458271d77a1355b815409792cc7..5c810252f6b1f4dc2327c8b04531ec000dc44feb 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -13,13 +13,19 @@ import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.dto.DataMenuDTO;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据管理目录类
@@ -180,6 +186,23 @@ public class DataMenuController {
             return ResponseResult.success(dataMenuDTO);
     }
 
+    /**
+     * (目录名称)编目名称和编目id
+     * @return 返回编目名称和编目id
+     * */
+    @ApiOperation(value="查询编目名称和对应的id")
+    @RequestMapping(value = "/menuidname", method = RequestMethod.POST)
+    public ResponseResult menuIdName() {
+        List<DataMenu> dataMenuList = dataMenuService.selectAll();
+        List<Map> hashMapList=new ArrayList<>();
+        for(int i=0;i<dataMenuList.size();i++){
+            Map<String,String> hashmap = new HashMap<>();
+            hashmap.put("value",dataMenuList.get(i).getId().toString());
+            hashmap.put("label",dataMenuList.get(i).getMenuName());
+            hashMapList.add(hashmap);
+        }
+        return ResponseResult.success(hashMapList);
+    }
 }
 
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index aa18b456d9564085990a11d5848887e39fbeb462..5c36248c0c9d7b668ce271263bf92c3b1ae16213 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -1,5 +1,6 @@
 /**
  * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所
+ *
  * @Title: 文件导入控制器文件
  * @author: 徐文远、肖小霞
  * @version: 1.0
@@ -8,137 +9,356 @@
  */
 package com.cetc32.dh.controller.rest;
 
-import com.cetc32.dh.utils.FileUtil;
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
+import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataSubmit;
+import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.service.DataSubmitService;
+import com.cetc32.dh.service.FileToMenuService;
+import com.cetc32.dh.utils.FileUtil;
+import com.cetc32.dh.service.AdminUserService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 
 @Component
 @RestController
 @RequestMapping("/rest/import/")
 public class FileSubmitController {
-    DataSubmitService dataSubmitService;
 
     @Autowired
-    public void setDataSubmitService(DataSubmitService dataSubmitService) {
-        this.dataSubmitService = dataSubmitService;
-    }
+    DataSubmitService dataSubmitService;
+    @Autowired
+    DataFileService dataFileService;
+    @Autowired
+    FileToMenuService fileToMenuService;
+    @Autowired
+    DataMenuService dataMenuService;
+    @Autowired
+    AdminUserService adminUserService;
 
-    @Value("${upload-path}")
-    public String uploadPath;
 
-    @RequestMapping(value = "/uploadFolder", method = RequestMethod.POST)
-    public String uploadFolder(MultipartFile[] folder) {
-        System.out.println(uploadPath);
-        FileUtil.saveMultiFile(uploadPath, folder);
-        return "ok";
-    }
+    @Value("${upLoadPath}")
+    String upLoadPath;
+
+//    /**
+//     * 批量文件夹上传服务器
+//     * @param folder  批量文件
+//     * @param dataSubmit  数据信息
+//     * @return ResponseResult   网页返回结果
+//     * **/
+//    @ApiOperation(value="批量文件上传")
+//    @PostMapping("/uploadFolder")
+//    public ResponseResult  uploadFolder(MultipartFile[] folder,DataSubmit dataSubmit) {
+//        dataSubmit=new DataSubmit(1,2,2,2,"SDF","DSF",3,"FG","DDD","DF",2011);
+//        System.out.println(uploadPath);
+//        System.out.println(folder.length);
+//        FileUtil.saveMultiFile(uploadPath, folder);
+//        dataSubmit.setSubtype(1);
+//        dataSubmit.setStatus(1);
+//        int count = dataSubmitService.insertDataSubmit(dataSubmit);
+//        if(0<=count){
+//            return ResponseResult.success("数据提交成功！");
+//        }
+//        return ResponseResult.error("数据提交失败！");
+//    }
 
     /**
      * 查询当前用户提交的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @ApiOperation(value="当前用户名提交的数据")
+    @ApiOperation(value = "当前用户名提交的数据")
     @PostMapping("/request")
-    public PageDataResult mySubmits(){
-        DataSubmit ds=new DataSubmit();
+    public PageDataResult mySubmits(Integer page, Integer results) {
+        DataSubmit ds = new DataSubmit();
         ds.setSubmitor("admin");
-        List<DataSubmit> list =new ArrayList<>();
-        Integer count =0;
-        list= dataSubmitService.selectMySubmit(ds);
-        count= dataSubmitService.countMineSubmit(ds);
-        return new PageDataResult(count,list);
+        List<DataSubmit> list = new ArrayList<>();
+        Integer count = 0;
+        list = dataSubmitService.selectMySubmit(ds);
+        count = dataSubmitService.countMineSubmit(ds);
+        return new PageDataResult(count, list, (page - 1) * results);
+
     }
 
     /**
      * 查询当前用户可以审核的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @ApiOperation(value="当前用户名下需要审核及已审核的所有任务")
+    @ApiOperation(value = "当前用户名下需要审核及已审核的所有任务")
     @PostMapping("/task")
-    public PageDataResult myApproves(){
-        DataSubmit ds=new DataSubmit();
+    public PageDataResult myApproves(Integer page, Integer results) {
+        DataSubmit ds = new DataSubmit();
         ds.setSubmitor("admin");
-        List<DataSubmit> list =new ArrayList<>();
-        Integer count =0;
-        list= dataSubmitService.selectMyApprove(ds);
-        count= dataSubmitService.countMineApprov(ds);
-        return new PageDataResult(count,list);
+        List<DataSubmit> list = new ArrayList<>();
+        Integer count = 0;
+        list = dataSubmitService.selectMyApprove(ds);
+        for (int i = 0; i < list.size(); i++) {
+        }
+        count = dataSubmitService.countMineApprov(ds);
+        return new PageDataResult(count, list, (page - 1) * results);
+//        return new PageDataResult(count,list);
     }
 
     /**
      * 拒绝导入请求
+     * @param map
      * @return 返回执行结果
      * **/
-    @ApiOperation(value="拒绝请求")
+    @ApiOperation(value = "拒绝请求")
     @PostMapping("/reject")
-    public ResponseResult rejectSubmit(Integer id){
-        DataSubmit ds =new DataSubmit();
-        ds.setId(id);
-        if(0 <= dataSubmitService.rejectSubmit(ds))
-            return ResponseResult.success();
-        return ResponseResult.error();
+    @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "")
+    public ResponseResult rejectSubmit(@RequestBody Map<String, Object> map) {
+        List<Integer> ids = new ArrayList<>();
+        ids = (List<Integer>) map.get("ids");
+        DataSubmit dataSubmit = null;
+        int sum = 0;
+        for (int i = 0; i < ids.size(); i++) {
+            Integer id = ids.get(i);
+            dataSubmit = dataSubmitService.queryById(id);
+            if (dataSubmitService.rejectSubmit(dataSubmit) > 0) {
+                String delFile = dataSubmit.getPath() + File.separator + dataSubmit.getTitle();
+                System.out.println(delFile);
+                FileUtil.deleteDir(delFile);
+                sum = sum + 1;
+            }
+        }
+        if (sum == ids.size())
+            return ResponseResult.success("已审批拒绝");
+        return ResponseResult.error("审批失败");
     }
 
     /**
      * 拒绝导入请求
      * @return 返回执行结果
      * **/
-    @ApiOperation(value="审核通过")
+    @ApiOperation(value = "审核通过")
     @PostMapping("/accept")
-    public ResponseResult acceptSubmit(Integer id){
-        DataSubmit ds =new DataSubmit();
-        ds.setId(id);
-        if(0 <= dataSubmitService.acceptSubmit(ds))
-            return ResponseResult.success();
-        return ResponseResult.error();
+    @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "")
+    public ResponseResult acceptSubmit(@RequestBody Map<String, Object> map) {
+        System.out.println(map);
+        List<Integer> ids = new ArrayList<>();
+        ids = (List<Integer>) map.get("ids");
+        DataSubmit dataSubmit = null;
+        DataFile dataFile = new DataFile();
+        DataFile new_dataFile = null;
+        FileToMenu fileToMenu = new FileToMenu();
+        int sum = 0;
+        for (int i = 0; i < ids.size(); i++) {
+            Integer id = ids.get(i);
+            dataSubmit = dataSubmitService.queryById(id);
+            dataSubmit.setReviewTime(new Date());
+            System.out.println(dataSubmit);
+            dataFile.setFileName(dataSubmit.getTitle());
+            dataFile.setFilePath(dataSubmit.getPath());
+            dataFile.setRegion(dataSubmit.getArea());
+            dataFile.setFileYear(dataSubmit.getYear());
+            dataFile.setFileDiscription(dataSubmit.getFileDiscription());
+            dataFile.setFileNumbers(dataSubmit.getFileNumbers());
+            dataFile.setFileSize(dataSubmit.getFileSize());
+            dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
+            dataFile.setApprover(dataSubmit.getApprover());
+            dataFile.setSubmitor(dataSubmit.getSubmitor());
+            dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".") + 1));
+            if (i != 0) {
+                dataFile.setId(dataFile.getId() + i);
+            }
+            int flag_file = dataFileService.insertDataFile(dataFile);
+            new_dataFile = dataFile;
+            System.out.println(new_dataFile);
+            fileToMenu.setFileId(new_dataFile.getId());
+            fileToMenu.setMenuId(dataSubmit.getMenuid());
+            int flag_filetomenu = fileToMenuService.insert(fileToMenu);
+            if (flag_file > 0 && flag_filetomenu > 0) {
+                if (dataSubmitService.acceptSubmit(dataSubmit) > 0) {
+                    sum = sum + 1;
+                }
+            }
+        }
+        if (sum == ids.size())
+            return ResponseResult.success("已审批通过");
+        return ResponseResult.error("审批失败");
     }
+
     /**
      * @param page 页码
      * @param results 每页显示条数
      * @return 分页数据
      * */
-    @ApiOperation(value="所有待审核的数据")
+    @ApiOperation(value = "所有待审核的数据")
     @PostMapping("/approves")
-    public PageDataResult myAprroves(@ApiParam(value="页码")Integer page, @ApiParam(value="每页数据条数")Integer results){
-        if(null ==page || page <= 0)
-            page=1;
-        if(null ==results||results <= 0 )
-            results=10;
-        DataSubmit ds =new DataSubmit();
-        return new PageDataResult(dataSubmitService.countReadyApprove(null),
-                dataSubmitService.selectReadyApprove(ds),(page-1)*results);
+    public PageDataResult myAprroves(@ApiParam(value = "页码") Integer page, @ApiParam(value = "每页数据条数") Integer results) {
+        if (null == page || page <= 0)
+            page = 1;
+        if (null == results || results <= 0)
+            results = 10;
+        DataSubmit ds = new DataSubmit();
+        ds.setStatus(0);
+        List<DataSubmit> list = new ArrayList<>();
+        list = dataSubmitService.selectReadyApprove(ds);
+        List<DataSubmit> list_new = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            String menuName = dataMenuService.queryById(list.get(i).getMenuid()).getMenuName();
+            list.get(i).setMenuName(menuName);
+        }
+        return new PageDataResult(dataSubmitService.countReadyApprove(ds),
+                list, (page - 1) * results);
     }
 
+
     /**
      * 提交数据
-     * @param dataSubmit 数据信息
+     //     * @param dataSubmit 数据信息
      * @return 返回提交结果
      * */
-    @ApiOperation(value="提交数据")
+    @ApiOperation(value = "提交数据", notes = "id不传参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false),
+            @ApiImplicitParam(name = "subtype", value = "提交类型", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "plevel", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "status", value = "文件状态", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "submitor", value = "提交者", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "approver", value = "审核人", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "menuid", value = "编目号", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "year", value = "年份", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "title", value = "标题", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "area", value = "区域", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "path", value = "提交路径(不传参)", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
+    })
     @PostMapping("/sub")
-    public ResponseResult DataSub(DataSubmit dataSubmit){
+    public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
+        String userId=dataSubmit.getUserId();
+        userId="1";
+        String upCachePath=upLoadPath+"_user"+userId;
+        System.out.println(dataSubmit);
+        String fileName = null;
+        Integer count = 0;
+        dataSubmit.setSubtype("1");
+        dataSubmit.setStatus(0);
+        dataSubmit.setApprover("审核人");
+        if((adminUserService.getUserById(Integer.parseInt(userId)))!=null){
+            dataSubmit.setSubmitor(adminUserService.getUserById(Integer.parseInt(userId)).getSysUserName());
+        }
+        DataSubmit dataSubmit_new = dataSubmit;
+        DataSubmit dataSubmit_new2 = dataSubmit;
+        String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
+        dataSubmit.setPath(path);
+        File baseFile = new File(upCachePath);
+        File[] files = baseFile.listFiles();
+        File file = null;
+//        List<String> pathListNew = new ArrayList<>();
+        for (int i = 0; i < files.length; i++) {
+            file = files[i];
+            if (file.isDirectory()) {
+                dataSubmit.setFileNumbers(FileUtil.getAllFile(upCachePath +File.separator+ file.getName()).size());
+                dataSubmit.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(file)));
+                fileName = FileUtil.getFileName(file.getName());
+                file.renameTo(new File(upCachePath +File.separator+ fileName));
+            } else {
+                fileName = file.getName();
+                dataSubmit.setFileSize(FileUtil.FormetFileSize(file.length()));
+                dataSubmit.setFileNumbers(1);
+            }
+            dataSubmit.setTitle(fileName);
+            dataSubmit.setSubtime(new Date());
+            dataSubmit_new = dataSubmit;
+            if (dataSubmitService.insertDataSubmit(dataSubmit_new) >= 0) {
+                count++;
+            }
+            dataSubmit_new2 = dataSubmit_new;
+            dataSubmit_new2.setId(dataSubmit_new.getId() + i + 1);
+            dataSubmit_new.setId(dataSubmit_new2.getId());
+        }
+
+        if (FileUtil.copyFolder(upCachePath, path) && count == files.length) {
+            FileUtil.deleteDir(upCachePath);
+            return ResponseResult.success("表单信息提交成功！");
+        }
+
+        return ResponseResult.error("表单信息提交失败！");
+    }
+
+
+    /**
+     * 目录/文件上传
+     * @param file 目录，文件
+     * @return 返回提交结果
+     * */
+    @ApiOperation(value = "文件上传")
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""),
+            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
+    })
+    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流")  MultipartFile[] file,String userId) {
+//        String filepath = "/root/upLoad";
+        userId="1";
+        String upCachePath=upLoadPath+"_user"+userId;
+        String filepath = upCachePath;
+        String result = FileUtil.uploadFile(file, filepath);
+        if (!result.contains("上传失败"))
+            return ResponseResult.success(result);
+        return ResponseResult.error(result);
+
+    }
 
-        int count = dataSubmitService.insertDataSubmit(dataSubmit);
 
-        if(0<=count){
-            return ResponseResult.success("数据提交成功！");
+    /**
+     * 文件上传缓冲区清空
+     * @return 返回文件清空结果
+     * */
+    @ApiOperation(value = "清空历史上传")
+    @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST)
+    @ApiImplicitParam(name = "userId", value = "当前用户id")
+    public ResponseResult clearUploadFile(String userId) {
+        String upCachePath=upLoadPath+"_user"+userId;
+        FileUtil.deleteDir(upCachePath);
+        File file = new File(upCachePath);
+        if (!file.exists()) {
+            return ResponseResult.success("历史上传清空成功");
         }
-        return ResponseResult.error("数据提交失败！");
+        return ResponseResult.error("历史上传清空失败");
+    }
 
+    /**
+     * 显示文件夹中文件详情
+     * @return 返回文件夹中文件结果
+     * */
+    @ApiOperation(value = "显示文件夹中的文件")
+    @PostMapping("/showFiles")
+    @ApiImplicitParam(name = "fileId", value = "文件id号", paramType = "body", dataType = "String")
+    public ResponseResult showFiles(@RequestBody String fileId) {
+        System.out.println(fileId);
+        if(dataFileService.queryById(Long.parseLong(fileId))!=null){
+            String filePath = dataFileService.queryById(Long.parseLong(fileId)).getFilePath();
+            String fileName = dataFileService.queryById(Long.parseLong(fileId)).getFileName();
+            String whole_dir = filePath+File.separator+fileName;
+            List<String> stringList = FileUtil.getAllFile(whole_dir);
+            List<String> fileNames = new ArrayList<String>();
+            for(int i=0;i<stringList.size();i++){
+                fileNames.add(stringList.get(i).substring(stringList.get(i).indexOf(fileName)));
+            }
+            return ResponseResult.success(fileNames);
+        }
+        return ResponseResult.error("没有该文件夹！");
     }
 
+
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 21743d746dc66f5c8cac4bb5717528f5a6d3e84d..1d6c95cbfac28900a304e854ce73ee28316ee7ce 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -10,19 +10,26 @@ package com.cetc32.dh.controller.rest;
 
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
+import com.cetc32.dh.entity.Options;
 import com.cetc32.dh.entity.VfileMenu;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.OptionsService;
+import com.cetc32.dh.service.VfileMenuService;
+import com.cetc32.dh.utils.FileUtil;
 import com.github.pagehelper.PageHelper;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.cetc32.dh.service.VfileMenuService;
-import springfox.documentation.annotations.ApiIgnore;
 
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 数据管理文件目录视图类
@@ -31,7 +38,7 @@ import java.util.List;
  * @date: 2020/10/14
  * 备注:无
  */
-@Api(value="Data File Info")
+@Api(value = "Data File Info")
 @Slf4j
 @RestController
 @RequestMapping("/rest/file/")
@@ -39,9 +46,14 @@ public class VfileMenuController {
 
     @Autowired
     public VfileMenuService vfileMenuService;
+    @Autowired
+    public OptionsService optionsService;
+    @Autowired
+    public DataFileService dataFileService;
 
     /**
      * 根据目录节点id和文件安全性查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param fileSecurity
@@ -49,7 +61,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryByFileSecurityAndMenuId")
-    public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String fileSecurity){
+    public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, String fileSecurity) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -57,14 +69,15 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryByFileSecurityAndMenuId(menuId,fileSecurity).size());
+        pdr.setTotals(vfileMenuService.queryByFileSecurityAndMenuId(menuId, fileSecurity).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryByFileSecurityAndMenuId(menuId,fileSecurity));
+        pdr.setList(vfileMenuService.queryByFileSecurityAndMenuId(menuId, fileSecurity));
         return pdr;
     }
 
     /**
      * 查询目录节点id下的文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -72,7 +85,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByMenuId")
-    public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId){
+    public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -89,6 +102,7 @@ public class VfileMenuController {
 
     /**
      * 根据目录节点id和文件时间查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -97,7 +111,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByTime")
-    public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, Date time){
+    public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, Date time) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -105,15 +119,16 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByTime(menuId,time).size());
+        pdr.setTotals(vfileMenuService.queryFilesByTime(menuId, time).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByTime(menuId,time));
+        pdr.setList(vfileMenuService.queryFilesByTime(menuId, time));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id和文件区域查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -122,7 +137,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByRegion")
-    public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String region){
+    public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, String region) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -130,15 +145,16 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByRegion(menuId,region).size());
+        pdr.setTotals(vfileMenuService.queryFilesByRegion(menuId, region).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByRegion(menuId,region));
+        pdr.setList(vfileMenuService.queryFilesByRegion(menuId, region));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id、文件名字、文件年份、文件区域、文件类型和文件安全性查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param fileName
@@ -150,7 +166,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByChoose")
-    public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
+    public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String fileName, Integer fileYear, String region, String fileType, String fileSecurity) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -158,34 +174,36 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity).size());
+        pdr.setTotals(vfileMenuService.queryFilesByChoose(fileName, fileYear, region, fileType, fileSecurity).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity));
+        pdr.setList(vfileMenuService.queryFilesByChoose(fileName, fileYear, region, fileType, fileSecurity));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id和文件视图对象查询文件
+     *
      * @param vfileMenu
      * @return pdr
      * 备注:无
      */
-    @ApiOperation(value="查询所有数据接口",notes="至少传入page，和current两个参数")
+    @ApiOperation(value = "查询所有数据接口", notes = "至少传入page，和current两个参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="page",value ="页码",paramType = "body",dataType = "Integer",required =true,defaultValue = "1"),
-            @ApiImplicitParam(name="results",value ="每页数据条数",paramType = "body",dataType = "Integer",required =true,defaultValue = "10"),
-            @ApiImplicitParam(name="fileName",value ="文件名称",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="fileYear",value ="文件年份",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="fileType",value ="文件类型",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="fileSecurity",value ="文件安全等级",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="region",value ="文件区域",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="menuId",value ="目录节点",paramType = "body",dataType = "Integer",defaultValue = "")
+            @ApiImplicitParam(name = "page", value = "页码", paramType = "body", dataType = "Integer", required = true, defaultValue = "1"),
+            @ApiImplicitParam(name = "results", value = "每页数据条数", paramType = "body", dataType = "Integer", required = true, defaultValue = "10"),
+            @ApiImplicitParam(name = "fileName", value = "文件名称", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "fileYear", value = "文件年份", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "fileSecurity", value = "文件安全等级", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "region", value = "文件区域", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "menuId", value = "目录节点", paramType = "body", dataType = "Integer", defaultValue = "")
     })
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu){
-        Integer page=vfileMenu.getPage();
-        Integer results=vfileMenu.getResults();
+    public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu) {
+        System.out.println(vfileMenu.getMenuId());
+        Integer page = vfileMenu.getPage();
+        Integer results = vfileMenu.getResults();
 
         if (page == null || page <= 0) {
             page = 1;
@@ -193,42 +211,448 @@ public class VfileMenuController {
         if (results == null || results <= 0)
             results = 10;
 
-        int offset=(page - 1) * results;
+        int offset = (page - 1) * results;
 
         return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu),
-                vfileMenuService.queryFilesByObj(offset,results,vfileMenu),
+                vfileMenuService.queryFilesByObj(offset, results, vfileMenu),
                 offset);
 
     }
 
-    /**查询数据库中所有的不同年份
+
+    /**
+     * 查询options中所有的不同年份
+     *
      * @return List<Integer>
      */
-    @ApiOperation(value="查询所有年份",notes="不需要传参数")
+    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
     @PostMapping("/AllYear")
     //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
-    public ResponseResult distinctAllYear(){
-        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
+    public ResponseResult distinctAllYear() {
+        List<Options> optionsList = optionsService.selectByCategory("file_year");
         List<Integer> yearList = new ArrayList<Integer>();
-        for(int i=0;i<vfileMenuList.size();i++){
-            yearList.add(vfileMenuList.get(i).getFileYear());
+        for(int i=0;i<optionsList.size();i++){
+            yearList.add(Integer.parseInt(optionsList.get(i).getValueName()));
+        }
+        Collections.sort(yearList);
+        Collections.reverse(yearList);
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部年份");
+        for (int i = 0; i < yearList.size(); i++) {
+            resultList.add(yearList.get(i).toString());
+        }
+
+        return ResponseResult.success(resultList);
+    }
+
+
+    /**
+     * 查询options中所有的不同区域
+     *
+     * @return List<String>
+     */
+    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
+    @PostMapping("/AllRegion")
+    public ResponseResult distinctAllRegion() {
+        List<Options> optionsList = optionsService.selectByCategory("region");
+        List<String> regionList = new ArrayList<String>();
+        for(int i=0;i<optionsList.size();i++){
+            regionList.add(optionsList.get(i).getValueName());
+        }
+
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部区域");
+        for (int i = 0; i < regionList.size(); i++) {
+            resultList.add(regionList.get(i).toString());
         }
 
-        return ResponseResult.success(yearList);
+        return ResponseResult.success(resultList);
     }
 
-    /**查询数据库中所有的不同区域
+
+
+    /**
+     * 查询数据库中所有的不同文件类型
+     *
      * @return List<String>
      */
-    @ApiOperation(value="查询所有区域",notes="不需要传参数")
+    @ApiOperation(value = "查询文件类型", notes = "不需要传参数")
+    @PostMapping("/AllFtype")
+    public ResponseResult optFType() {
+        List<Options> optionsList = optionsService.selectByCategory("file_type");
+        List<Map> hashMapList = new ArrayList<>();
+        Map<String, String> hashmap = new HashMap<>();
+        hashmap.put("value", "全部类型");
+        hashmap.put("label", "全部类型");
+        hashMapList.add(hashmap);
+        for (int i = 0; i < optionsList.size(); i++) {
+            Map<String, String> hashmap2 = new HashMap<>();
+            hashmap2.put("value", optionsList.get(i).getValue());
+            hashmap2.put("label", optionsList.get(i).getValueName());
+            hashMapList.add(hashmap2);
+        }
+        return ResponseResult.success(hashMapList);
+    }
+
+
+    /**
+     * 下载文件文件，文件夹
+     *
+     * @return String
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
+    })
+    @GetMapping("/downloadMulFile")
+    public String downloadMulFile(String[] fileIds, HttpServletResponse response) {
+
+        if (fileIds.length == 1) {
+            Long fileId = Long.parseLong(fileIds[0]);
+            String fileName = dataFileService.queryById(fileId).getFileName();
+            String filePath = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+            if (!FileUtil.isDirectory(filePath)) {
+                FileUtil.downloadFile(response, fileName, filePath);
+            }
+        }
+
+        String message= null;
+        String directory = "/root/load";
+        File directoryFile = new File(directory);
+        if (!directoryFile.isDirectory() && !directoryFile.exists()) {
+            directoryFile.mkdirs();
+        }
+        //设置最终输出zip文件的目录+文件名
+        String zipFileName = "已下载文件" + ".zip";
+        String strZipPath = directory + "/" + zipFileName;
+        File zipFile = new File(strZipPath);
+        //读取需要压缩的文件
+        Long fileId =null;
+        String fileName=null;
+
+        List<String> fileNames = new ArrayList<>();
+        List<String> filePaths = new ArrayList<>();
+        for(int i=0;i<fileIds.length;i++){
+            fileId = Long.parseLong(fileIds[i]);
+            if(dataFileService.queryById(fileId)!=null){
+                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+                if (FileUtil.isDirectory(fileName)) {
+                    List<String> stringList = FileUtil.getAllFile(fileName);
+                    for (int j = 0; j < stringList.size(); j++) {
+                        fileNames.add(stringList.get(j));
+                        filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                    }
+                } else {
+                    fileNames.add(fileName);
+                    filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                }
+            }
+        }
+
+        ZipOutputStream zipStream = null;
+        FileInputStream zipSource = null;
+        BufferedInputStream bufferStream = null;
+        try {
+            //构造最终压缩包的输出流
+            zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
+            for (int i = 0; i < fileNames.size(); i++) {
+                //解码获取真实路径与文件名
+//                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+                String realFilePath = fileNames.get(i);
+                System.out.println(realFilePath);
+                File file = new File(realFilePath);
+                //TODO:未对文件不存在时进行操作，后期优化。
+                if (file.exists()) {
+                    zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
+                    /**
+                     * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
+                     * 文件名和之前的重复就会导致文件被覆盖
+                     */
+//                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+                    ZipEntry zipEntry = new ZipEntry(fileNames.get(i).replace(filePaths.get(i),""));//在压缩目录中文件的名字
+                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
+                    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
+                    int read = 0;
+                    byte[] buf = new byte[1024 * 10];
+                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
+                        zipStream.write(buf, 0, read);
+                    }
+                }else{
+                    message=message+file.getName()+"不存在！"+"\n";
+                    System.out.println(file.getName()+"不存在！");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            //关闭流
+            try {
+                if (null != bufferStream) bufferStream.close();
+                if (null != zipStream) {
+                    zipStream.flush();
+                    zipStream.close();
+                }
+                if (null != zipSource) zipSource.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
+        if (zipFile.exists()) {
+            System.out.println(zipFileName);
+            System.out.println(strZipPath);
+            FileUtil.downloadFile(response, zipFileName, strZipPath);
+            FileUtil.deleteDir(directory);
+        }
+        if(message==null){
+            message="全部文件下载成功！";
+        }
+        return message;
+
+    }
+
+
+/**
+ *
+ *提示： 待保留代码部分
+ * 作者：肖小霞
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
+    })
+    @PostMapping("/downloadFiles")
+    public ResponseResult downloadFiles(@RequestBody String fileIds) {
+//        Long fileId=15L;
+//        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
+        String clientIp = "";
+        HttpServletRequest request = null;
+        try {
+            request =
+                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+        } catch (Exception e) {
+            System.out.println("Can not get current IP.");
+        }
+        clientIp = request.getRemoteAddr().toString();
+        System.out.println(clientIp);
+        String savePath = clientIp + "/root/downLoad";
+        System.out.println(savePath);
+        List<String> results = new ArrayList<>();
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        System.out.println(fileName);
+        String res = FileUtil.downloadFile(fileName, savePath);
+        results.add(res);
+
+
+        return ResponseResult.success(results);
+    }
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
+    })
+    @RequestMapping("/downloadOneFile")
+    public String downloadAlone(String fileIds, HttpServletResponse response) {
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        File file = new File(fileName);
+        System.out.println(fileName);
+        if (!file.exists()) {
+            System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!");
+        }
+
+        response.setHeader("Content-Type","application/octet-stream");
+        //设置下载的文件的名称-该方式已解决中文乱码问题
+        try {
+            response.setHeader("Content-Disposition","attachment;filename=" +  new String( dataFileService.queryById(fileId).getFileName().getBytes("gb2312"), "ISO8859-1" ));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        byte[] buffer = new byte[1024];
+        FileInputStream fis = null;
+        BufferedInputStream bis = null;
+        try {
+            fis = new FileInputStream(file);
+            bis = new BufferedInputStream(fis);
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+            System.out.println("Download  successfully!");
+            return dataFileService.queryById(fileId).getFileName() + "下载成功！";
+
+        } catch (Exception e) {
+            System.out.println("Download  failed!");
+            return dataFileService.queryById(fileId).getFileName() + "下载失败！";
+
+        } finally {
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
+
+     // 查询数据库中所有的不同年份
+
+    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
+    @PostMapping("/AllYear")
+    //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
+    public ResponseResult distinctAllYear() {
+        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
+        List<Integer> yearList = new ArrayList<Integer>();
+        for (int i = 0; i < vfileMenuList.size(); i++) {
+            yearList.add(vfileMenuList.get(i).getFileYear());
+        }
+        Collections.sort(yearList);
+        Collections.reverse(yearList);
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部年份");
+        for (int i = 0; i < yearList.size(); i++) {
+            resultList.add(yearList.get(i).toString());
+        }
+
+        return ResponseResult.success(resultList);
+    }
+
+
+     // 查询数据库中所有的不同区域
+
+    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
     @PostMapping("/AllRegion")
-    public ResponseResult distinctAllRegion(){
+    public ResponseResult distinctAllRegion() {
         List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
         List<String> regionList = new ArrayList<String>();
-        for(int i=0;i<vfileMenuList.size();i++){
+
+        for (int i = 0; i < vfileMenuList.size(); i++) {
             regionList.add(vfileMenuList.get(i).getRegion());
         }
+        Collections.sort(regionList);
 
-        return ResponseResult.success(regionList);
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部区域");
+        for (int i = 0; i < regionList.size(); i++) {
+            resultList.add(regionList.get(i));
+        }
+        return ResponseResult.success(resultList);
     }
+    **/
+
+
+/**
+ *
+ * 文件下载代码
+
+ public String downloadMulFile2(String[] fileIds,HttpServletResponse response) {
+
+ if(fileIds.length==1){
+ Long fileId =Long.parseLong(fileIds[0]);
+ String fileName= dataFileService.queryById(fileId).getFileName();
+ String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+ FileUtil.downloadFile(response,fileName,filePath);
+ }
+
+ String message= null;
+ String directory = "/root/load";
+ File directoryFile = new File(directory);
+ if (!directoryFile.isDirectory() && !directoryFile.exists()) {
+ directoryFile.mkdirs();
+ }
+ //设置最终输出zip文件的目录+文件名
+ String zipFileName = "已下载文件" + ".zip";
+ String strZipPath = directory + "/" + zipFileName;
+ File zipFile = new File(strZipPath);
+ //读取需要压缩的文件
+ Long fileId =null;
+ String fileName=null;
+
+ List<String> fileNames = new ArrayList<>();
+ for(int i=0;i<fileIds.length;i++){
+ fileId = Long.parseLong(fileIds[i]);
+ if(dataFileService.queryById(fileId)!=null){
+ fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+ fileNames.add(fileName);
+ }
+ }
+
+ //        System.out.println("-------------3222--------------" + fileIds);
+
+ ZipOutputStream zipStream = null;
+ FileInputStream zipSource = null;
+ BufferedInputStream bufferStream = null;
+ try {
+ //构造最终压缩包的输出流
+ zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
+ for (int i = 0; i < fileNames.size(); i++) {
+ //解码获取真实路径与文件名
+ String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+ //                System.out.println(fileNames.get(i));
+ System.out.println(realFilePath);
+ File file = new File(realFilePath);
+ //TODO:未对文件不存在时进行操作，后期优化。
+ if (file.exists()) {
+ zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
+
+ * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
+ * 文件名和之前的重复就会导致文件被覆盖
+
+ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
+    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
+    int read = 0;
+    byte[] buf = new byte[1024 * 10];
+                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
+        zipStream.write(buf, 0, read);
+    }
+}else{
+        message=message+file.getName()+"不存在！"+"\n";
+        System.out.println(file.getName()+"不存在！");
+        }
+        }
+        } catch (Exception e) {
+        e.printStackTrace();
+        } finally {
+        //关闭流
+        try {
+        if (null != bufferStream) bufferStream.close();
+        if (null != zipStream) {
+        zipStream.flush();
+        zipStream.close();
+        }
+        if (null != zipSource) zipSource.close();
+        } catch (IOException e) {
+        e.printStackTrace();
+        }
+        }
+        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
+        if (zipFile.exists()) {
+        System.out.println(zipFileName);
+        System.out.println(strZipPath);
+        FileUtil.downloadFile(response, zipFileName, strZipPath);
+        zipFile.delete();
+        }
+        if(message==null){
+        message="全部文件下载成功！";
+        }
+        return message;
+
+        }
+
+ */
+
 }
diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java
index 11204e7c1bca3374d485bab4a86f3fee2527f641..ea1d0fefbaef3117f30ee69f69b149956f164250 100644
--- a/src/main/java/com/cetc32/dh/controller/system/UserController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/UserController.java
@@ -14,22 +14,18 @@ import com.cetc32.dh.dto.LoginDTO;
 import com.cetc32.dh.dto.UserSearchDTO;
 import com.cetc32.dh.entity.BaseAdminUser;
 import com.cetc32.dh.service.AdminUserService;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.DisabledAccountException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.servlet.ShiroHttpServletRequest;
-import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import javax.management.ValueExp;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.HashMap;
diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java
index 8f66385efa53a6cf4f6bed42a22fa2d8b7a9b01f..a7cccc60c577110611293bd543b8a17caf3a244c 100644
--- a/src/main/java/com/cetc32/dh/entity/DataFile.java
+++ b/src/main/java/com/cetc32/dh/entity/DataFile.java
@@ -36,7 +36,9 @@ public class DataFile {
      * @param fileYear
      * 有参构造函数
      */
-    public DataFile(Long id, String fileName, String fileType, String fileSecurity, String filePath, Date createTime,String region,Integer fileYear){
+    public DataFile(Long id, String fileName, String fileType, String fileSecurity, String filePath, Date createTime,
+                    String region, Integer fileYear, String fileSize, Integer fileNumbers, String fileDiscription,
+                    String submitor, String approver){
         this.id=id;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -45,165 +47,306 @@ public class DataFile {
         this.filePath=filePath;
         this.region=region;
         this.fileYear=fileYear;
+        this.fileSize=fileSize;
+        this.fileNumbers=fileNumbers;
+        this.fileDiscription=fileDiscription;
+        this.submitor=submitor;
+        this.approver=approver;
     }
 
     /**
-     * id
+     * 文件(夹)id
      */
     @Id
     private Long id;
 
     /**
-     * 文件名字
+     * 文件(夹)所属年份
+     */
+    @Column(name = "file_year")
+    private Integer fileYear;
+
+    /**
+     * 文件(夹)名字
      */
     @Column(name = "file_name")
     private String fileName;
 
     /**
-     * 文件类型
+     * 文件(夹)类型
      */
     @Column(name = "file_type")
     private String fileType;
 
     /**
-     * 文件安全等级
+     * 文件(夹)安全等级
      */
     @Column(name = "file_security")
     private String fileSecurity;
 
     /**
-     * 文件路径
+     * 文件(夹)存放路径
      */
     @Column(name = "file_path")
     private String filePath;
 
     /**
-     * 文件创建时间
+     * 文件(夹)创建时间
      */
     @Column(name = "create_time")
     private Date createTime;
 
     /**
-     * 文件区域
+     * 文件(夹)所属区域
      */
     private String region;
 
     /**
-     * 文件年份
+     * 文件(夹)大小
      */
-    @Column(name = "file_year")
-    private Integer fileYear;
+    @Column(name = "file_size")
+    private String fileSize;
+
+    /**
+     * 文件夹中文件个数
+     */
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
 
     /**
-     * @return id
+     * 文件(夹)描述
+     */
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
+    private String submitor;
+
+    private String approver;
+
+    /**
+     * 获取文件(夹)id
+     *
+     * @return id - 文件(夹)id
      */
     public Long getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置文件(夹)id
+     *
+     * @param id 文件(夹)id
      */
     public void setId(Long id) {
         this.id = id;
     }
 
     /**
-     * @return file_name
+     * 获取文件(夹)所属年份
+     *
+     * @return file_year - 文件(夹)所属年份
+     */
+    public Integer getFileYear() {
+        return fileYear;
+    }
+
+    /**
+     * 设置文件(夹)所属年份
+     *
+     * @param fileYear 文件(夹)所属年份
+     */
+    public void setFileYear(Integer fileYear) {
+        this.fileYear = fileYear;
+    }
+
+    /**
+     * 获取文件(夹)名字
+     *
+     * @return file_name - 文件(夹)名字
      */
     public String getFileName() {
         return fileName;
     }
 
     /**
-     * @param fileName
+     * 设置文件(夹)名字
+     *
+     * @param fileName 文件(夹)名字
      */
     public void setFileName(String fileName) {
-        this.fileName = fileName;
+        this.fileName = fileName == null ? null : fileName.trim();
     }
 
     /**
-     * @return file_type
+     * 获取文件(夹)类型
+     *
+     * @return file_type - 文件(夹)类型
      */
     public String getFileType() {
         return fileType;
     }
 
     /**
-     * @param fileType
+     * 设置文件(夹)类型
+     *
+     * @param fileType 文件(夹)类型
      */
     public void setFileType(String fileType) {
-        this.fileType = fileType;
+        this.fileType = fileType == null ? null : fileType.trim();
     }
 
     /**
-     * @return file_security
+     * 获取文件(夹)安全等级
+     *
+     * @return file_security - 文件(夹)安全等级
      */
     public String getFileSecurity() {
         return fileSecurity;
     }
 
     /**
-     * @param fileSecurity
+     * 设置文件(夹)安全等级
+     *
+     * @param fileSecurity 文件(夹)安全等级
      */
     public void setFileSecurity(String fileSecurity) {
-        this.fileSecurity = fileSecurity;
+        this.fileSecurity = fileSecurity == null ? null : fileSecurity.trim();
     }
 
     /**
-     * @return file_path
+     * 获取文件(夹)存放路径
+     *
+     * @return file_path - 文件(夹)存放路径
      */
     public String getFilePath() {
         return filePath;
     }
 
     /**
-     * @param filePath
+     * 设置文件(夹)存放路径
+     *
+     * @param filePath 文件(夹)存放路径
      */
     public void setFilePath(String filePath) {
-        this.filePath = filePath;
+        this.filePath = filePath == null ? null : filePath.trim();
     }
 
     /**
-     * @return create_time
+     * 获取文件(夹)创建时间
+     *
+     * @return create_time - 文件(夹)创建时间
      */
     public Date getCreateTime() {
         return createTime;
     }
 
     /**
-     * @param createTime
+     * 设置文件(夹)创建时间
+     *
+     * @param createTime 文件(夹)创建时间
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
     /**
-     * @return region
+     * 获取文件(夹)所属区域
+     *
+     * @return region - 文件(夹)所属区域
      */
     public String getRegion() {
         return region;
     }
 
     /**
-     * @param region
+     * 设置文件(夹)所属区域
+     *
+     * @param region 文件(夹)所属区域
      */
     public void setRegion(String region) {
-        this.region = region;
+        this.region = region == null ? null : region.trim();
     }
 
     /**
-     * @return file_year
+     * 获取文件(夹)大小
+     *
+     * @return file_size - 文件(夹)大小
      */
-    public Integer getFileYear() {
-        return fileYear;
+    public String getFileSize() {
+        return fileSize;
     }
 
     /**
-     * @param fileYear
+     * 设置文件(夹)大小
+     *
+     * @param fileSize 文件(夹)大小
      */
-    public void setFileYear(Integer fileYear) {
-        this.fileYear = fileYear;
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * 获取文件夹中文件个数
+     *
+     * @return file_numbers - 文件夹中文件个数
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * 设置文件夹中文件个数
+     *
+     * @param fileNumbers 文件夹中文件个数
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * 获取文件(夹)描述
+     *
+     * @return file_discription - 文件(夹)描述
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * 设置文件(夹)描述
+     *
+     * @param fileDiscription 文件(夹)描述
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
+    }
+
+    /**
+     * @return submitor
+     */
+    public String getSubmitor() {
+        return submitor;
+    }
+
+    /**
+     * @param submitor
+     */
+    public void setSubmitor(String submitor) {
+        this.submitor = submitor == null ? null : submitor.trim();
+    }
+
+    /**
+     * @return approver
+     */
+    public String getApprover() {
+        return approver;
+    }
+
+    /**
+     * @param approver
+     */
+    public void setApprover(String approver) {
+        this.approver = approver == null ? null : approver.trim();
     }
 
     /**
@@ -217,7 +360,10 @@ public class DataFile {
                 ", fileSecurity=" + fileSecurity+'\'' +
                 ", filePath=" + filePath +'\'' +
                 ", createTime=" + createTime +'\'' +
-                ", region=" + region +
+                ", region=" + region +'\'' +
+                ", fileSize=" + fileSize +'\'' +
+                ", fileNumbers=" + fileNumbers +'\'' +
+                ", fileDiscription=" + fileDiscription +
                 '}';
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 52ecf8f4a126eb55b2a7805e594a1c05945da2d8..5a3abd617936139bc333de0aad79038f4c699548 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -1,177 +1,378 @@
-/**
- * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所
- * @Title: 数据库实体类
- * @author: 徐文远
- * @version: 1.0
- * @date: 2020/10/15
- * 备注:无
- */
 package com.cetc32.dh.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
-
-/**
- * 数据库实体类
- * @author: xiao
- * @version: 徐文远
- * @date: 2020/10/15
- * 备注:无
- */
-@Table(name="data_submit")
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "data_submit")
 public class DataSubmit extends NumberS{
 
-    /**
-     * id
-     * */
-    @Column(name = "id ")
-    Integer id ;
+    public DataSubmit(){}
+
+    public DataSubmit(Integer id, String subtype, Integer plevel, Integer status, String submitor, String approver,
+                      Long menuid, String menuName, Integer year, String title, String area, String path) {
+        this.id=id;
+        this.subtype=subtype;
+        this.plevel=plevel;
+        this.status=status;
+        this.submitor=submitor;
+        this.approver=approver;
+        this.menuid=menuid;
+        this.year=year;
+        this.title=title;
+        this.area=area;
+        this.path=path;
+        this.menuName=menuName;
 
-    /**
-     * 数据上报类型
-     * **/
-    @Column(name = "subtype")
-    Integer subtype;
+    }
 
-    /**
-     * 权限级别
-     * */
-    @Column(name = "plevel")
-    Integer plevel;
 
-    /**
-     * 状态：1表示一提交待审核，2一审核通过，3一审核拒绝
-     * */
-    @Column(name = "status")
-    Integer status;
+    @Id
+    private Integer id;
 
     /**
-     * 提交者
-     * */
-    @Column(name = "sumbitor")
-    String submitor;
+     * '报送类型,外部接口上报或本地路径上报'
+     */
+    private String subtype;
 
-    /**
-     * 审核人
-     * */
-    @Column(name = "approver")
-    String approver;
+    private Integer plevel;
+
+    private Integer status;
+
+    private String submitor;
+
+    private String approver;
 
-    /**
-     * 所属菜单
-     * */
     @Column(name = "menuId")
-    Integer menuId;
+    private Long menuid;
 
-    /**
-     * 标题
-     * */
-    @Column(name = "title")
-    String title;
+    private Integer year;
 
-    /**
-     * 区域
-     * */
-    @Column(name = "area")
-    String area;
+    private String title;
 
-    /**
-     * 存储路径
-     * */
-    @Column(name = "path")
-    String path;
+    private String area;
 
-    /**
-     * 所属年分
-     * */
-    @Column(name = "year")
-    Integer year;
+    private String path;
 
+    @Column(name = "file_type")
+    private String fileType;
+
+    private Date subtime;
+
+    @Column(name = "review_time")
+    private Date reviewTime;
+
+    @Column(name = "file_size")
+    private String fileSize;
+
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
+
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
+    private String[] pathList;
+
+    private String menuName;
+
+     private String userId;
+
+    /**
+     * @return id
+     */
     public Integer getId() {
         return id;
     }
 
+    /**
+     * @param id
+     */
     public void setId(Integer id) {
         this.id = id;
     }
 
-    public Integer getSubtype() {
+
+
+    /**
+     * @return userId
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * @param userId
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取'报送类型,外部接口上报或本地路径上报'
+     *
+     * @return subtype - '报送类型,外部接口上报或本地路径上报'
+     */
+    public String getSubtype() {
         return subtype;
     }
 
-    public void setSubtype(Integer subtype) {
+    /**
+     * 设置'报送类型,外部接口上报或本地路径上报'
+     *
+     * @param subtype '报送类型,外部接口上报或本地路径上报'
+     */
+    public void setSubtype(String subtype) {
         this.subtype = subtype;
     }
 
+    /**
+     * @return plevel
+     */
     public Integer getPlevel() {
         return plevel;
     }
 
+    /**
+     * @param plevel
+     */
     public void setPlevel(Integer plevel) {
         this.plevel = plevel;
     }
 
+    /**
+     * @return status
+     */
     public Integer getStatus() {
         return status;
     }
 
+    /**
+     * @param status
+     */
     public void setStatus(Integer status) {
         this.status = status;
     }
 
+    /**
+     * @return submitor
+     */
     public String getSubmitor() {
         return submitor;
     }
 
+    /**
+     * @param submitor
+     */
     public void setSubmitor(String submitor) {
-        this.submitor = submitor;
+        this.submitor = submitor == null ? null : submitor.trim();
     }
 
+    /**
+     * @return approver
+     */
     public String getApprover() {
         return approver;
     }
 
+    /**
+     * @param approver
+     */
     public void setApprover(String approver) {
-        this.approver = approver;
+        this.approver = approver == null ? null : approver.trim();
+    }
+
+    /**
+     * @return menuId
+     */
+    public Long getMenuid() {
+        return menuid;
+    }
+
+    /**
+     * @param menuid
+     */
+    public void setMenuid(Long menuid) {
+        this.menuid = menuid;
     }
 
-    public Integer getMenuId() {
-        return menuId;
+    /**
+     * @return year
+     */
+    public Integer getYear() {
+        return year;
     }
 
-    public void setMenuId(Integer menuId) {
-        this.menuId = menuId;
+    /**
+     * @param year
+     */
+    public void setYear(Integer year) {
+        this.year = year;
     }
 
+    /**
+     * @return title
+     */
     public String getTitle() {
         return title;
     }
 
+    /**
+     * @param title
+     */
     public void setTitle(String title) {
-        this.title = title;
+        this.title = title == null ? null : title.trim();
     }
 
+    /**
+     * @return area
+     */
     public String getArea() {
         return area;
     }
 
+    /**
+     * @param area
+     */
     public void setArea(String area) {
-        this.area = area;
+        this.area = area == null ? null : area.trim();
     }
 
+    /**
+     * @return path
+     */
     public String getPath() {
         return path;
     }
 
+    /**
+     * @param path
+     */
     public void setPath(String path) {
-        this.path = path;
+        this.path = path == null ? null : path.trim();
     }
 
-    public Integer getYear() {
-        return year;
+    /**
+     * @return file_type
+     */
+    public String getFileType() {
+        return fileType;
     }
 
-    public void setYear(Integer year) {
-        this.year = year;
+    /**
+     * @param fileType
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType == null ? null : fileType.trim();
+    }
+
+    /**
+     * @return subtime
+     */
+    public Date getSubtime() {
+        return subtime;
+    }
+
+    /**
+     * @param subtime
+     */
+    public void setSubtime(Date subtime) {
+        this.subtime = subtime;
+    }
+
+    /**
+     * @return review_time
+     */
+    public Date getReviewTime() {
+        return reviewTime;
+    }
+
+    /**
+     * @param reviewTime
+     */
+    public void setReviewTime(Date reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    /**
+     * @return file_size
+     */
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize
+     */
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * @return file_numbers
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * @param fileNumbers
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * @return file_discription
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * @param fileDiscription
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
+    }
+
+
+
+    /**
+     * @param pathList
+     */
+    public void setPathList(String[] pathList) {
+        this.pathList = pathList;
+    }
+
+    public String[]  getPathList() {
+        return this.pathList;
+    }
+
+    /**
+     * @param menuName
+     */
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String  getMenuName() {
+        return this.menuName;
+    }
+
+
+
+    public String toString() {
+        return "{" +
+                "id=" + id +'\'' +
+                ",subtype=" + subtype +'\'' +
+                ",plevel=" + plevel + '\'' +
+                ",status=" + status+'\'' +
+                ",submitor=" + submitor +'\'' +
+                ",approver=" + approver + '\'' +
+                ",path=" + path+'\'' +
+                ",year=" + year+'\'' +
+                ",title=" + title+'\'' +
+                ",menuName=" + menuName+'\'' +
+                ",area=" + area +
+                '}';
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/Options.java b/src/main/java/com/cetc32/dh/entity/Options.java
new file mode 100644
index 0000000000000000000000000000000000000000..d74d9234701f4fb0bea81e12eae1ec884191aa9e
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/Options.java
@@ -0,0 +1,71 @@
+package com.cetc32.dh.entity;
+
+import javax.persistence.*;
+
+public class Options {
+    @Id
+    private Integer id;
+
+    @Column(name = "value_name")
+    private String valueName;
+
+    private String value;
+
+    private String category;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return value_name
+     */
+    public String getValueName() {
+        return valueName;
+    }
+
+    /**
+     * @param valueName
+     */
+    public void setValueName(String valueName) {
+        this.valueName = valueName == null ? null : valueName.trim();
+    }
+
+    /**
+     * @return value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * @param value
+     */
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+
+    /**
+     * @return category
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * @param category
+     */
+    public void setCategory(String category) {
+        this.category = category == null ? null : category.trim();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index 21256ef92b9877b25316436912a0817b3302b93b..045156a1771b6290aeab05051bb6392c0a3f1395 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -43,7 +43,9 @@ public class VfileMenu extends NumberS{
      * @param menuId
      * 有参构造函数
      */
-    public VfileMenu( Long fileId, String fileName, String fileType, String fileSecurity, String filePath,Date createTime,String region,Long menuId,Integer fileYear){
+    public VfileMenu( Long fileId, String fileName, String fileType, String fileSecurity, String filePath,Date createTime,
+                      String region,Long menuId,Integer fileYear,String fileSize,Integer fileNumbers,String fileDiscription,
+                      String submitor, String approver){
         this.fileId=fileId;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -53,6 +55,11 @@ public class VfileMenu extends NumberS{
         this.region=region;
         this.menuId=menuId;
         this.fileYear=fileYear;
+        this.fileSize=fileSize;
+        this.fileNumbers=fileNumbers;
+        this.fileDiscription=fileDiscription;
+        this.submitor=submitor;
+        this.approver=approver;
     }
 
     /**
@@ -109,6 +116,28 @@ public class VfileMenu extends NumberS{
     @Column(name = "region")
     private String region;
 
+    /**
+     * 文件(夹)大小
+     */
+    @Column(name = "file_size")
+    private String fileSize;
+
+    /**
+     * 文件夹中文件个数
+     */
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
+
+    /**
+     * 文件(夹)描述
+     */
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
+    private String submitor;
+
+    private String approver;
+
     /**
      * 目录节点menuId
      */
@@ -261,6 +290,101 @@ public class VfileMenu extends NumberS{
     public void setFileYear(Integer fileYear) {
         this.fileYear = fileYear;
     }
+    /**
+     * @param f
+     */
+    public void setFileYear(String f) {
+        try {
+            fileYear=Integer.valueOf(f);
+        }catch (Exception e){
+            fileYear=null;
+        }
+
+    }
+
+    /**
+     * 获取文件(夹)大小
+     *
+     * @return file_size - 文件(夹)大小
+     */
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * 设置文件(夹)大小
+     *
+     * @param fileSize 文件(夹)大小
+     */
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * 获取文件夹中文件个数
+     *
+     * @return file_numbers - 文件夹中文件个数
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * 设置文件夹中文件个数
+     *
+     * @param fileNumbers 文件夹中文件个数
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * 获取文件(夹)描述
+     *
+     * @return file_discription - 文件(夹)描述
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * 设置文件(夹)描述
+     *
+     * @param fileDiscription 文件(夹)描述
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
+    }
+
+
+
+    /**
+     * @return submitor
+     */
+    public String getSubmitor() {
+        return submitor;
+    }
+
+    /**
+     * @param submitor
+     */
+    public void setSubmitor(String submitor) {
+        this.submitor = submitor == null ? null : submitor.trim();
+    }
+
+    /**
+     * @return approver
+     */
+    public String getApprover() {
+        return approver;
+    }
+
+    /**
+     * @param approver
+     */
+    public void setApprover(String approver) {
+        this.approver = approver == null ? null : approver.trim();
+    }
 
     /**
      * @return numberId
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
index fb3cb6cda9725aa45e30bbc740c9308134ebfb34..bf8d2ee2806031ec7198e51dc320251442a3dcfe 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
@@ -9,7 +9,6 @@
 package com.cetc32.dh.mybatis;
 
 import com.cetc32.dh.entity.DataFile;
-import com.cetc32.dh.entity.DataMenu;
 import tk.mybatis.mapper.common.Mapper;
 import org.springframework.stereotype.Repository;
 import java.util.Date;
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
index 3692602143493f202626486da23ef0e4f523e0da..0638f71c0bea7e72a41ac5d41d289cc6a022edb6 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
@@ -35,5 +35,7 @@ public interface DataMenuMapper extends Mapper<DataMenu> {
 
     public DataMenu queryByPid(Long pid);
 
+    public List<DataMenu>  selectAll();
+
     public List<DataMenu> queryByPIdSatisfyId(Long id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
index 527b4e72f1b3565b98ede7278a7b755b2827b890..8ce3bae1f7725b8a70fc3b8f88a28ad87c95f3d2 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
@@ -56,4 +56,6 @@ public interface DataSubmitMapper {
      * @return 反馈查询到的数据记录
      * */
     List<DataSubmit> selectByStatusAndUser(DataSubmit ds);
+
+    DataSubmit queryById(Integer id);
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
index f377a2ee1fe9efee6107505c1048e765ad6994dd..463441161af9fd1b9e2eff003c2e671819a825a4 100644
--- a/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
@@ -26,4 +26,6 @@ public interface FileToMenuMapper extends Mapper<FileToMenu> {
     public List<FileToMenu> selectByFileId(Long fileId);
 
     public List<FileToMenu> selectByMenuId(Long menuId);
+
+    public int insert(FileToMenu fileToMenu);
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java b/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..3f7457b7accb16421be7a9e0ab935c2f0541a790
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java
@@ -0,0 +1,14 @@
+package com.cetc32.dh.mybatis;
+
+import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.entity.Options;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
+import java.util.List;
+
+@Repository
+public interface OptionsMapper extends Mapper<Options> {
+
+    public List<Options> selectByCategory(String category);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
index b58e07982315936883c3ff2dcee7c93a4a0983a5..2507efd667f188e27c6ad0437d54e7095ec71714 100644
--- a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
@@ -8,7 +8,6 @@
  */
 package com.cetc32.dh.mybatis;
 
-import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.VfileMenu;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -44,4 +43,6 @@ public interface VfileMenuMapper extends Mapper<VfileMenu> {
 
     public List<VfileMenu> distinctAllRegion();
 
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/DataMenuService.java b/src/main/java/com/cetc32/dh/service/DataMenuService.java
index 78a8b0f23d15e21748a63ab0595f0df50d81afc1..04d6a635af5fab6e2a7440557126ed7d730bbe63 100644
--- a/src/main/java/com/cetc32/dh/service/DataMenuService.java
+++ b/src/main/java/com/cetc32/dh/service/DataMenuService.java
@@ -42,6 +42,8 @@ public interface DataMenuService {
 
     public String addDataMenu(DataMenu dataMenu );
 
+    public List<DataMenu>  selectAll();
+
     public List<DataFile> showFilesByMenuId(Long menuId);
 
 }
diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
index 4e1ce5f389c2aa97b6c9a34533a8ed39dd47e792..4c0bc83b5548e82776d1fa382c41b4378579930f 100644
--- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java
+++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
@@ -10,16 +10,15 @@
 package com.cetc32.dh.service;
 
 import com.cetc32.dh.entity.DataSubmit;
-
 import java.util.List;
 
 public interface DataSubmitService {
     /**
      * 提交请求后数据插入操作
-     * @param ds 更新到数库的数据
+     * @param dataSubmit 更新到数库的数据
      * @return 反馈是否成功
      * **/
-    public Integer insertDataSubmit(DataSubmit ds);
+    public Integer insertDataSubmit(DataSubmit dataSubmit);
 
     /**
      * 拒绝用户此时数据导入申请
@@ -76,4 +75,7 @@ public interface DataSubmitService {
      * @return 反馈查询到的数据个数
      * */
     Integer countReadyApprove(DataSubmit dataSubmit);
+
+    DataSubmit queryById(Integer id);
+
 }
diff --git a/src/main/java/com/cetc32/dh/service/FileToMenuService.java b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
new file mode 100644
index 0000000000000000000000000000000000000000..ae20213d37191c33bc589d43c9ae16cf6007e992
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
@@ -0,0 +1,10 @@
+package com.cetc32.dh.service;
+
+import com.cetc32.dh.entity.FileToMenu;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FileToMenuService {
+
+    public int insert(FileToMenu fileToMenu);
+}
diff --git a/src/main/java/com/cetc32/dh/service/OptionsService.java b/src/main/java/com/cetc32/dh/service/OptionsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..6af6448251b142a37538029bd846e120de4f5089
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/OptionsService.java
@@ -0,0 +1,9 @@
+package com.cetc32.dh.service;
+
+import java.util.List;
+import com.cetc32.dh.entity.Options;
+
+public interface OptionsService {
+
+    public List<Options> selectByCategory(String category);
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
index 10e9209914dc3154b9ed35b8f0e2fc2f1624c880..429664db1b1822bc79bee58915073bcf368860bc 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
@@ -198,5 +198,9 @@ public class DataMenuServiceImpl implements DataMenuService {
             return message;
     }
 
+    public List<DataMenu>  selectAll(){
+        return dataMenuMapper.selectAll();
+    }
+
 
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
index f6fe8812632f74a5777cdd35b91d7372b592fe57..a748410541eee738d1dafe6f9578b0d5eca654cc 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
@@ -15,6 +15,7 @@ import com.cetc32.dh.service.DataSubmitService;
 import org.apache.shiro.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 
 /**
@@ -37,13 +38,12 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer insertDataSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getApprover()==null||ds.getPath()==null||ds.getArea()==null||ds.getYear()==null) {
+        if (ds.getApprover() == null || ds.getPath() == null || ds.getArea() == null || ds.getYear() == null) {
             return -1;
-        }
-        else{
+        } else {
             return dsMapper.insertOne(ds);
         }
     }
@@ -56,13 +56,14 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer rejectSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getId()==null){
+        if (ds.getId() == null) {
             return -1;
         }
         ds.setStatus(-1);
+        ds.setApprover("审核人已拒绝");
         return dsMapper.updateById(ds);
 
     }
@@ -75,13 +76,14 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer acceptSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getId()==null){
+        if (ds.getId() == null) {
             return -1;
         }
-        ds.setStatus(2);
+        ds.setStatus(1);
+        ds.setApprover("审核人已审核");
         return dsMapper.updateById(ds);
     }
 
@@ -93,7 +95,7 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public List<DataSubmit> selectMySubmit(DataSubmit dataSubmit) {
-        if(dataSubmit==null){
+        if (dataSubmit == null) {
             return null;
         }
         dataSubmit.setApprover(null);
@@ -108,7 +110,7 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public List<DataSubmit> selectMyApprove(DataSubmit dataSubmit) {
-        if(dataSubmit==null){
+        if (dataSubmit == null) {
             return null;
         }
         dataSubmit.setSubmitor(null);
@@ -118,12 +120,13 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * 根据当前用户统计所有任务个数
+     *
      * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
      * @return 反馈查询到的数据个数
-     * */
-    public Integer countMineSubmit(DataSubmit dataSubmit){
+     */
+    public Integer countMineSubmit(DataSubmit dataSubmit) {
         Assert.notNull(dataSubmit);
-        if(null==dataSubmit.getSubmitor())
+        if (null == dataSubmit.getSubmitor())
             return -1;
         dataSubmit.setApprover(null);
         return dsMapper.countMine(dataSubmit);
@@ -131,12 +134,13 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * 根据当前用户统计所有任务个数
+     *
      * @param dataSubmit 通常dataSubmit一次查询只包含approver。
      * @return 反馈查询到的数据个数
-     * */
-    public Integer countMineApprov(DataSubmit dataSubmit){
+     */
+    public Integer countMineApprov(DataSubmit dataSubmit) {
         Assert.notNull(dataSubmit);
-        if(null==dataSubmit.getApprover())
+        if (null == dataSubmit.getApprover())
             return -1;
         dataSubmit.setSubmitor(null);
         return dsMapper.countMine(dataSubmit);
@@ -167,11 +171,25 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * DataSubmitMapper注入方法，必须用@Autowired注解
+     *
      * @param dsMapper 待注入的bean
      * @return 反馈为空
-     * **/
+     **/
     @Autowired
     public void setDsMapper(DataSubmitMapper dsMapper) {
         this.dsMapper = dsMapper;
     }
+
+    /**
+     * 根据当前id查找DataSubmit实体
+     *
+     * @param id 根据id查询
+     * @return DataSubmit
+     */
+    @Override
+    public DataSubmit queryById(Integer id) {
+        return dsMapper.queryById(id);
+    }
 }
+
+
diff --git a/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f79e6c798aa70742344014d5241c31bb6eaeafc
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java
@@ -0,0 +1,19 @@
+package com.cetc32.dh.service.impl;
+
+import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.mybatis.FileToMenuMapper;
+import com.cetc32.dh.service.FileToMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FileToMenuServiceImpl implements FileToMenuService {
+
+    @Autowired
+    public FileToMenuMapper fileToMenuMapper;
+
+    @Override
+    public int insert(FileToMenu fileToMenu){
+        return fileToMenuMapper.insert(fileToMenu);
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java b/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..8105b64e9b3a4a7f0d76ca487a8e47a058dc24c9
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java
@@ -0,0 +1,20 @@
+package com.cetc32.dh.service.impl;
+
+import com.cetc32.dh.service.OptionsService;
+import com.cetc32.dh.entity.Options;
+import com.cetc32.dh.mybatis.OptionsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OptionsImpl  implements OptionsService {
+
+    @Autowired
+    public OptionsMapper optionsMapper;
+
+    public List<Options> selectByCategory(String category){
+        return optionsMapper.selectByCategory(category);
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
index 9a71fd44461ac06b2014d0bc3af6364bf5f6cda3..52c00b09143409fd3b29f09efd058d483e58ebb4 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -80,6 +80,7 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      */
     @Override
     public List<VfileMenu> queryFilesByChoose(String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
+        fileName="%"+fileName+"%";
         return vfileMenuMapper.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity);
     }
 
@@ -91,6 +92,16 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      */
     @Override
     public List<VfileMenu> queryFilesByObj(Integer offset, Integer limit, VfileMenu vfileMenu){
+        if(vfileMenu.getFileName()!=null){
+            String fileName="%"+vfileMenu.getFileName()+"%";
+            vfileMenu.setFileName(fileName);
+        }
+        if(vfileMenu.getRegion().equals("全部区域")){
+            vfileMenu.setRegion(null);
+        }
+        if(vfileMenu.getFileType().equals("全部类型")){
+            vfileMenu.setFileType(null);
+        }
         return  vfileMenuMapper.queryFilesByObj(offset,limit,vfileMenu);
     }
 
@@ -118,4 +129,6 @@ public class VfileMenuServiceImpl implements VfileMenuService {
     public List<VfileMenu> distinctAllRegion(){
         return vfileMenuMapper.distinctAllRegion();
     }
+
+
 }
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 57a0a293066b884aebb7a5e755d508b48d9d20a3..5c64aafc9deaf8fbe43785ab3f5683b8b79d2eae 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -1,19 +1,33 @@
 package com.cetc32.dh.utils;
 
+import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 
 public class FileUtil {
 
     /**
      * 在basePath下保存上传的文件夹
+     *
      * @param basePath
      * @param files
      */
     public static void saveMultiFile(String basePath, MultipartFile[] files) {
+
         if (files == null || files.length == 0) {
+            if (files == null) {
+                System.out.println("files为空！！");
+                return;
+            }
+            System.out.println("files长度为0");
             return;
         }
         if (basePath.endsWith("/")) {
@@ -32,8 +46,10 @@ public class FileUtil {
         }
     }
 
+
     /**
      * 确保目录存在，不存在则创建
+     *
      * @param filePath
      */
     private static void makeDir(String filePath) {
@@ -45,4 +61,325 @@ public class FileUtil {
             }
         }
     }
-}
\ No newline at end of file
+
+
+    /**
+     * 目录文件上传
+     *
+     * @param files
+     * @param filepath
+     */
+    public static String uploadFile(MultipartFile[] files, String filepath) {
+        System.out.println(files.length);
+        if (files.length == 0) {
+            return null;
+        }
+        int uploadsSum = 0;
+        String FileDir = null;
+        for (int i = 0; i < files.length; i++) {
+            String flag = "";
+            MultipartFile file = files[i];
+            String fileName = file.getOriginalFilename();//获取文件名
+            String dirName = filepath +File.separator + fileName;
+            FileDir = fileName;
+            System.out.println(FileDir);
+            System.out.println(dirName);
+            makeDir(dirName);
+
+            if (true) {        //!file.isEmpty()
+                try (BufferedOutputStream out = new BufferedOutputStream(
+                        new FileOutputStream(new File(dirName)))) {
+                    out.write(file.getBytes());
+                    out.flush();
+                    flag = "文件上传成功";
+                } catch (FileNotFoundException e) {
+                    flag = "文件上传失败";
+                } catch (IOException e) {
+                    flag = "文件上传失败";
+                }
+            }
+            if (flag.equals("文件上传成功")) {
+                uploadsSum++;
+            }
+        }
+        if (uploadsSum == files.length) {
+            if (FileDir.contains("/")){
+                return FileDir.substring(0,FileDir.indexOf("/"));
+            }
+            return FileDir;
+
+        }
+        return FileDir+"上传失败";
+    }
+
+    /**
+     * 文件下载
+     *
+     * @param response
+     * @param filename
+     * @param path
+     */
+    public static void downloadFile(HttpServletResponse response, String filename, String path){
+        if (filename != null) {
+            FileInputStream is = null;
+            BufferedInputStream bs = null;
+            OutputStream os = null;
+            try {
+                File file = new File(path);
+                if (file.exists()) {
+                    //设置Headers
+                    response.setHeader("Content-Type","application/octet-stream");
+                    //设置下载的文件的名称-该方式已解决中文乱码问题
+                    response.setHeader("Content-Disposition","attachment;filename=" +  new String( filename.getBytes("gb2312"), "ISO8859-1" ));
+                    is = new FileInputStream(file);
+                    bs =new BufferedInputStream(is);
+                    os = response.getOutputStream();
+                    byte[] buffer = new byte[1024];
+                    int len = 0;
+                    while((len = bs.read(buffer)) != -1){
+                        os.write(buffer,0,len);
+                    }
+                }else{
+                    String error = Base64Util.encode("下载的文件资源不存在");
+                }
+            }catch(IOException ex){
+                ex.printStackTrace();
+            }finally {
+                try{
+                    if(is != null){
+                        is.close();
+                    }
+                    if( bs != null ){
+                        bs.close();
+                    }
+                    if( os != null){
+                        os.flush();
+                        os.close();
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 判断是否为目录
+     * @param file
+     * @return boolean
+     */
+    public static boolean isDirectory(String file) {
+        File f = new File(file);
+        return f.isDirectory();
+    }
+
+    /**
+     * 拷贝目录文件到新路径
+     * @param oldPath
+     * @param newPath
+     * @return boolean
+     */
+    public static boolean copyFolder(String oldPath, String newPath) {
+
+        try {
+            (new File(newPath)).mkdirs(); //如果文件夹不存在 则建立新文件夹
+            File a = new File(oldPath);
+            String[] file = a.list();
+            File temp = null;
+            for (int i = 0; i < file.length; i++) {
+                if(oldPath.endsWith(File.separator)){
+                    temp=new File(oldPath+file[i]);
+                    System.out.println("#################################");
+                    System.out.println(temp);
+                }
+                else{
+                    temp=new File(oldPath+File.separator+file[i]);
+                    System.out.println("#################################");
+                    System.out.println(temp);
+                }
+
+                if(temp.isFile()){
+                    FileInputStream input = new FileInputStream(temp);
+                    FileOutputStream output = new FileOutputStream(newPath + "/" +
+                            (temp.getName()).toString());
+                    byte[] b = new byte[1024 * 5];
+                    int len;
+                    while ( (len = input.read(b)) != -1) {
+                        output.write(b, 0, len);
+                    }
+                    output.flush();
+                    output.close();
+                    input.close();
+                }
+                if(temp.isDirectory()){//如果是子文件夹
+                    copyFolder(oldPath+"/"+file[i],newPath+"/"+file[i]);
+                }
+            }
+            System.out.println("复制整个文件夹内容操作成功");
+            return true;
+        }
+        catch (Exception e) {
+            System.out.println("复制整个文件夹内容操作出错");
+            e.printStackTrace();
+            return false;
+
+        }
+    }
+
+    /**
+     * 删除目录
+     * @param dirPath
+     */
+    public static void deleteDir(String dirPath)
+    {
+        File file = new File(dirPath);
+        if(file.isFile())
+        {
+            file.delete();
+        }else
+        {
+            File[] files = file.listFiles();
+            if(files == null)
+            {
+                file.delete();
+            }else
+            {
+                for (int i = 0; i < files.length; i++)
+                {
+                    deleteDir(files[i].getAbsolutePath());
+                }
+                file.delete();
+            }
+        }
+    }
+
+    /**
+     * 将文件内容写到新的文件中
+     * @param fileName
+     * @param savepath
+     * @return String
+     */
+    public static String writeFile(String fileName, String savepath) {
+        System.out.println(fileName);
+//        File readerfile = new File(fileName);
+        String readerfile = fileName;
+        String outFile = savepath +  File.separator +fileName.split("/")[fileName.split("/").length-1];
+        makeDir(outFile);
+//        File writerfile = new File(outFile);
+        String writerfile =outFile;
+
+        FileInputStream fileInputStream = null;
+        BufferedInputStream bufferedInputStream = null;
+        FileOutputStream fileOutputStream = null;
+        BufferedOutputStream bufferedOutputStream = null;
+        try {
+            // 将读取文件对象加载进字符读取对象中
+            fileInputStream = new FileInputStream(readerfile);
+            // 将字符读取对象加载进字符读取缓冲流对象
+            bufferedInputStream = new BufferedInputStream(fileInputStream);
+            // 将写入的文件对象加载进字符写入对象中
+            fileOutputStream = new FileOutputStream(writerfile);
+            // 将字符写入对象加载进字符写入缓冲流对象中
+            bufferedOutputStream = new BufferedOutputStream(fileOutputStream);
+            // 按行获取读取缓冲流中的数据
+            int bytes=-1;
+
+            while ((bytes = bufferedInputStream.read())!=-1) {
+                bufferedOutputStream.write(bytes);
+            }
+            return (fileName.split("/")[fileName.split("/").length-1]+"下载成功！");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return fileName.split("/")[fileName.split("/").length-1]+"下载失败！";
+        } finally {
+            // 关闭文件流对象
+            try {
+                if (bufferedInputStream != null)
+                    bufferedInputStream.close();
+                if (bufferedOutputStream != null)
+                    bufferedOutputStream.close();
+                if (fileOutputStream != null)
+                    fileOutputStream.close();
+                if (fileInputStream != null)
+                    fileInputStream.close();
+            } catch (IOException e2) {
+                e2.printStackTrace();
+                return fileName.split("/")[fileName.split("/").length-1]+"下载失败！";
+            }
+        }
+
+    }
+
+
+    /**
+     * 文件名后缀前添加一个时间戳
+     */
+    public static String getFileName(String fileName) {
+        int index = fileName.lastIndexOf(".");
+        String nowTimeStr; // 当前时间
+        Date date = new Date();
+        SimpleDateFormat sif = new SimpleDateFormat("yyyyMMddHHmmss");
+        nowTimeStr = sif.format(date);
+
+//      fileName = fileName.substring(0, index) + "_" + nowTimeStr + fileName.substring(index);
+
+        fileName=fileName+"_"+nowTimeStr;
+
+        return fileName;
+    }
+
+
+    /**
+     * 获取目录中所有的文件名
+     * @param  directoryPath
+     */
+    public static List<String> getAllFile(String directoryPath) {
+        List<String> list = new ArrayList<String>();
+        File baseFile = new File(directoryPath);
+        if (baseFile.isFile() || !baseFile.exists()) {
+            return list;
+        }
+        File[] files = baseFile.listFiles();
+        for (File file : files) {
+            if (file.isDirectory()) {
+                list.addAll(getAllFile(file.getAbsolutePath()));
+            } else {
+                list.add(file.getAbsolutePath());
+            }
+        }
+
+        for(int i=0;i<list.size();i++){
+            System.out.println(list.get(i));
+        }
+        System.out.println("###############################!!!!!!!!!");
+        return list;
+    }
+
+    /**
+     * 转换文件大小
+     *
+     * @param fileS
+     * @return
+     */
+    public static String FormetFileSize(long fileS) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        String fileSizeString = "";
+        String wrongSize = "0B";
+        if (fileS == 0) {
+            return wrongSize;
+        }
+        if (fileS < 1024) {
+            fileSizeString = df.format((double) fileS) + "B";
+        } else if (fileS < 1048576) {
+            fileSizeString = df.format((double) fileS / 1024) + "KB";
+        } else if (fileS < 1073741824) {
+            fileSizeString = df.format((double) fileS / 1048576) + "MB";
+        } else {
+            fileSizeString = df.format((double) fileS / 1073741824) + "GB";
+        }
+        return fileSizeString;
+    }
+
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f483fe4ce2052108a8153bed38508cda18d8c517..a7ec0c2e660fe4768231fa9df98e5b1767feb979 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
     username: root
-    password: 123456
+    password: 123
     #    initial-size: 1
     #    min-idle: 1
     #    max-active: 20
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index 52c1821cd86a53b4231e4982c175f35757e74614..9753d2f347a5316d6e706c9319ca28c28eab0a29 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -7,7 +7,7 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
     username: root
-    password: 123456
+    password: 123
     #    initial-size: 1
     #    min-idle: 1
     #    max-active: 20
@@ -20,6 +20,7 @@ spring:
     multipart:
       max-file-size: 500MB
       max-request-size: 500MB
+
   redis:
     database: 0
 # Redis服务器地址
@@ -39,6 +40,8 @@ spring:
       min-idle: 0
 # 连接超时时间（毫秒）
     timeout: 1000
+
+
 mybatis:
     mapper-locations: classpath:mapper/*.xml
     type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
@@ -48,6 +51,10 @@ mybatis:
 #设置静态资源路径，多个以逗号分隔
 spring.resources.static-locations: classpath:static/,file:static/
 
+storePath: /root/
+upLoadPath: ${storePath}upLoad/
+
+
 generator:
   targetProject: src/main/java
   mappers: tk.mybatis.mapper.common.Mapper
@@ -56,4 +63,5 @@ generator:
   javaClient-targetPackage: com.cetc32.dh.mybatis
 logging:
   level:
-    com.cetc32.dh.mybatis: debug
\ No newline at end of file
+    com.cetc32.dh.mybatis: debug
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2ac5fe7bb87e4e22d648a54a2004d5db0b2526ee..4f5137e3d8ac1db2b716c29eff8a1e18d2c6e715 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 #spring:
 #  profiles:
 #    active: dev
-    #热部署生效
\ No newline at end of file
+#    #热部署生效
\ No newline at end of file
diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml
index 6dd12cd6216fa91064914e0993c13c8deae21349..034fccebf7e012dd8a930d410a46ced92e6c3d88 100644
--- a/src/main/resources/generator.xml
+++ b/src/main/resources/generator.xml
@@ -54,6 +54,7 @@
                              type="XMLMAPPER"/>
 
         <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
+        <table tableName="data_submit"></table>
         <table schema="EstimateTask"  tableName="estimate_task"
                enableSelectByPrimaryKey="true"
                enableUpdateByPrimaryKey="true"
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 59539a0117abb74701595da7faa0b1239ce4d39d..e791d854156f71c70303d78e504df503673e3aca 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -2,7 +2,7 @@ spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&chara
 #spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=123
 
 #Mybatis扫描
 mybatis.mapper-locations=classpath*:com/**/mapper/**.xml
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index 3917076337e345adcf93a6aa1dc30e5e5d3a2f60..3a495827d1e4c3488600451136819d921c1049d1 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -6,13 +6,18 @@
       WARNING - @mbg.generated
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="file_year" jdbcType="INTEGER" property="fileYear" />
     <result column="file_name" jdbcType="VARCHAR" property="fileName" />
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
     <result column="file_security" jdbcType="VARCHAR" property="fileSecurity" />
     <result column="file_path" jdbcType="VARCHAR" property="filePath" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="region" jdbcType="VARCHAR" property="region" />
-    <result column="file_year" jdbcType="INTEGER" property="fileYear" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
   </resultMap>
 
   <select id="countAll" resultType="java.lang.Long">
@@ -43,9 +48,7 @@
         file_path,
       </if>
 
-      <if test="createTime!= null">
         create_time,
-      </if>
 
       <if test="region!= null">
         region,
@@ -55,6 +58,26 @@
         file_year,
       </if>
 
+      <if test="fileSize!= null">
+        file_size,
+      </if>
+
+      <if test="fileNumbers!= null">
+        file_numbers,
+      </if>
+
+      <if test="fileDiscription!= null">
+        file_discription,
+      </if>
+
+      <if test="approver!= null">
+        approver,
+      </if>
+
+      <if test="submitor!= null">
+        submitor,
+      </if>
+
     </trim>
 
 
@@ -80,9 +103,7 @@
         #{filePath,jdbcType=VARCHAR},
       </if>
 
-      <if test="createTime!= null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
+      now(),
 
       <if test="region!= null">
         #{region,jdbcType=VARCHAR},
@@ -92,6 +113,26 @@
         #{fileYear,jdbcType=INTEGER},
       </if>
 
+      <if test="fileSize!= null">
+        #{fileSize,jdbcType=VARCHAR},
+      </if>
+
+      <if test="fileNumbers!= null">
+        #{fileNumbers,jdbcType=INTEGER},
+      </if>
+
+      <if test="fileDiscription!= null">
+        #{fileDiscription,jdbcType=VARCHAR},
+      </if>
+
+      <if test="approver!= null">
+        #{approver,jdbcType=VARCHAR},
+      </if>
+
+      <if test="submitor!= null">
+        #{submitor,jdbcType=VARCHAR},
+      </if>
+
     </trim>
   </insert>
 
@@ -117,6 +158,23 @@
       <if test="fileYear != null">
         file_year = #{fileYear,jdbcType=INTEGER},
       </if>
+      <if test="fileSize != null">
+        file_size = #{fileSize,jdbcType=VARCHAR},
+      </if>
+      <if test="fileNumbers != null">
+        file_numbers = #{fileNumbers,jdbcType=INTEGER},
+      </if>
+      <if test="fileDiscription != null">
+        file_discription = #{fileDiscription,jdbcType=VARCHAR},
+      </if>
+      <if test="approver!= null">
+        approver = #{approver,jdbcType=VARCHAR},
+      </if>
+
+      <if test="submitor!= null">
+        submitor = #{submitor,jdbcType=VARCHAR},
+      </if>
+
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml
index f58fddb588af35fedfff39b6a6e6b6c202f6ba31..bb69c7cd56f6d7b8936c611e97f4230ce35ab54f 100644
--- a/src/main/resources/mapper/DataMenuMapper.xml
+++ b/src/main/resources/mapper/DataMenuMapper.xml
@@ -106,6 +106,10 @@
         where  pid= #{pid,jdbcType=BIGINT}
     </select>
 
+  <select id="selectAll" resultType="com.cetc32.dh.entity.DataMenu" >
+        select * from data_menu
+    </select>
+
 
 
   <delete id="deleteById" parameterType="java.lang.Long">
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index 1d352bf4245885f43ec2d80fa8404052a6e645f6..4257df8983c127831be3dcef7cd8a41e5b50c790 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cetc32.dh.mybatis.DataSubmitMapper">
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.DataSubmit">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="subtype" jdbcType="INTEGER" property="subtype" />
+    <result column="plevel" jdbcType="INTEGER" property="plevel" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
+    <result column="menuId" jdbcType="INTEGER" property="menuid" />
+    <result column="year" jdbcType="INTEGER" property="year" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="area" jdbcType="VARCHAR" property="area" />
+    <result column="path" jdbcType="VARCHAR" property="path" />
+    <result column="file_type" jdbcType="VARCHAR" property="fileType" />
+    <result column="subtime" jdbcType="TIMESTAMP" property="subtime" />
+    <result column="review_time" jdbcType="TIMESTAMP" property="reviewTime" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
+  </resultMap>
 
   <insert id="insertOne" keyProperty="id" useGeneratedKeys="true" parameterType="com.cetc32.dh.entity.DataSubmit">
     insert into data_submit
@@ -22,14 +44,23 @@
         submitor,
       </if>
 
+      <if test="status!= null">
+        status,
+      </if>
+
+      <if test="path!= null">
+        path,
+      </if>
+
       <if test="approver!= null">
         approver,
       </if>
 
-      <if test="menuId!= null">
-        menuId,
+      <if test="menuid!= null">
+        menuid,
       </if>
 
+
       <if test="title!= null">
         title,
       </if>
@@ -41,13 +72,39 @@
       <if test="year!= null">
         year,
       </if>
+
+      <if test="fileType!= null">
+        file_type,
+      </if>
+
+      <if test="subtime!= null">
+        subtime,
+      </if>
+
+      <if test="reviewTime!= null">
+        review_time,
+      </if>
+
+      <if test="fileSize!= null">
+        file_size,
+      </if>
+
+      <if test="fileNumbers!= null">
+        file_numbers,
+      </if>
+
+      <if test="fileDiscription!= null">
+        file_discription,
+      </if>
+
+
     </trim>
 
 
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
       <if test="id != null">
-        #{id},
+       #{id},
       </if>
 
       <if test="subtype!= null">
@@ -62,14 +119,24 @@
         #{submitor},
       </if>
 
+
+      <if test="status!= null">
+        #{status},
+      </if>
+
+      <if test="path!= null">
+        #{path},
+      </if>
+
       <if test="approver!= null">
         #{approver},
       </if>
 
-      <if test="menuId!= null">
-        #{menuId},
+      <if test="menuid!= null">
+        #{menuid},
       </if>
 
+
       <if test="title!= null">
         #{title},
       </if>
@@ -81,7 +148,33 @@
       <if test="year!= null">
         #{year},
       </if>
+
+      <if test="fileType!= null">
+        #{fileType},
+      </if>
+
+      <if test="subtime!= null">
+        #{subtime},
+      </if>
+
+      <if test="reviewTime!= null">
+        #{reviewTime},
+      </if>
+
+      <if test="fileSize!= null">
+        #{fileSize},
+      </if>
+
+      <if test="fileNumbers!= null">
+        #{fileNumbers},
+      </if>
+
+      <if test="fileDiscription!= null">
+        #{fileDiscription},
+      </if>
+
     </trim>
+
   </insert>
 
 
@@ -94,17 +187,49 @@
       <if test="plevel != null">
         plevel = #{plevel},
       </if>
-      <if test="menuId != null">
-        menuId = #{menuId},
+      <if test="menuid != null">
+        menuId = #{menuid},
       </if>
-
       <if test="year != null">
         year = #{year},
       </if>
-
       <if test="area != null">
         area = #{area},
       </if>
+      <if test="approver != null">
+        approver = #{approver},
+      </if>
+      <if test="title != null">
+        title = #{title},
+      </if>
+      <if test="path != null">
+        path = #{path},
+      </if>
+      <if test="subtype != null">
+        subtype = #{subtype},
+      </if>
+      <if test="submitor != null">
+        submitor = #{submitor},
+      </if>
+      <if test="fileType != null">
+        file_type = #{fileType},
+      </if>
+      <if test="subtime != null">
+        subtime = #{subtime},
+      </if>
+      <if test="reviewTime != null">
+        review_time = #{reviewTime},
+      </if>
+      <if test="fileSize != null">
+        file_size = #{fileSize},
+      </if>
+      <if test="fileNumbers != null">
+        file_numbers = #{fileNumbers},
+      </if>
+      <if test="fileDiscription != null">
+        file_discription = #{fileDiscription},
+      </if>
+
     </set>
     where id = #{id}
   </update>
@@ -132,6 +257,7 @@
       </if>
     </where>
   </select>
+
   <select id="selectByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
     select * from data_submit
     <where>
@@ -143,6 +269,7 @@
       </if>
     </where>
   </select>
+
   <select id="countByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
     select count(*) from data_submit
     <where>
@@ -154,4 +281,11 @@
       </if>
     </where>
   </select>
+
+
+  <select id="queryById" parameterType="java.lang.Integer" resultType="com.cetc32.dh.entity.DataSubmit">
+        select * from data_submit
+        where  id= #{id}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/FileToMenuMapper.xml b/src/main/resources/mapper/FileToMenuMapper.xml
index 610547556ea34d26c667c3b05b26185325377333..aabc0b603e344c1fc8b98236d16c39e345f78050 100644
--- a/src/main/resources/mapper/FileToMenuMapper.xml
+++ b/src/main/resources/mapper/FileToMenuMapper.xml
@@ -20,4 +20,32 @@
         where  menu_id= #{menuId,jdbcType=BIGINT}
     </select>
 
+    <insert id="insert"   parameterType="com.cetc32.dh.entity.FileToMenu" >
+        insert into file_to_menu
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+
+            <if test="menuId!= null">
+                menu_id,
+            </if>
+
+            <if test="fileId!= null">
+                file_id,
+            </if>
+        </trim>
+
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+
+            <if test="menuId!= null">
+                #{menuId,jdbcType=BIGINT},
+            </if>
+
+            <if test="fileId!= null">
+                #{fileId ,jdbcType=BIGINT},
+            </if>
+        </trim>
+
+    </insert>
+
+
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/OptionsMapper.xml b/src/main/resources/mapper/OptionsMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83f191186620a9cbcd9bd60d3998653f4f641439
--- /dev/null
+++ b/src/main/resources/mapper/OptionsMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cetc32.dh.mybatis.OptionsMapper">
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.Options">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="value_name" jdbcType="VARCHAR" property="valueName" />
+    <result column="value" jdbcType="VARCHAR" property="value" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+  </resultMap>
+
+  <select id="selectByCategory" resultType="com.cetc32.dh.entity.Options" >
+        select * from options
+        where  category= #{category,jdbcType=VARCHAR}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index d7e2f255e36210bb08187a4026b616bf09536136..344cbc5888e3a02aa22314465a0675c2b54d7be5 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -14,6 +14,11 @@
     <result column="region" jdbcType="VARCHAR" property="region" />
     <result column="menu_id" jdbcType="BIGINT" property="menuId" />
     <result column="file_year" jdbcType="INTEGER" property="fileYear" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
   </resultMap>
 
 
@@ -41,7 +46,7 @@
         select * from vfile_menu
         <trim prefix="where" prefixOverrides="and |or ">
             <if test="fileName != null">
-                and file_name = #{fileName}
+                and file_name  like #{fileName}
             </if>
             <if test="fileYear!=null">
                 and file_year = #{fileYear}
@@ -65,7 +70,7 @@
                 and menu_id = #{vfileMenu.menuId}
             </if>
             <if test="vfileMenu.fileName != null">
-                and file_name = #{vfileMenu.fileName}
+                and file_name like #{vfileMenu.fileName}
             </if>
             <if test="vfileMenu.fileYear!=null">
                 and file_year = #{vfileMenu.fileYear}
@@ -118,4 +123,5 @@
 
 
 
+
 </mapper>
\ No newline at end of file