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 9a9e03922ccf8ab2cb46be50e78b45e67e4f731c..1d4a0f43e47934f1103a791ffe6ae6d1d55ff265 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -107,4 +107,23 @@ public class FileSubmitController {
         return new PageDataResult(dataSubmitService.countReadyApprove(null),
                 dataSubmitService.selectReadyApprove(ds),(page-1)*results);
     }
+
+    /**
+     * 提交数据
+     * @param dataSubmit 数据信息
+     * @return 返回提交结果
+     * */
+    @ApiOperation(value="提交数据")
+    @PostMapping("/sub")
+    public ResponseResult DataSub(DataSubmit dataSubmit){
+
+        int count = dataSubmitService.insertDataSubmit(dataSubmit);
+
+        if(0<=count){
+            return ResponseResult.success("数据提交成功！");
+        }
+        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 1169b64a0636ec89c8d6bbd77cd79e48dd29370f..21743d746dc66f5c8cac4bb5717528f5a6d3e84d 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -19,6 +19,8 @@ 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;
 
@@ -181,27 +183,16 @@ public class VfileMenuController {
             @ApiImplicitParam(name="menuId",value ="目录节点",paramType = "body",dataType = "Integer",defaultValue = "")
     })
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(//@ApiParam(value="当前页码",required = true,defaultValue = "1")@RequestBody Integer page,
-                                          //@ApiParam(value="每页数据条数",required = true,defaultValue = "2")@RequestBody Integer results,
-                                          /*@ApiParam(value="文件名称")String fileName,
-                                          @ApiParam(value="文件年份")Integer fileYear,
-                                          @ApiParam(value="文件区域")String region,
-                                          @ApiParam(value="目录节点")Long menuId,
-                                          @ApiParam(value="文件类型")String fileType,
-                                          @ApiParam(value="文件安全等级")String fileSecurity){*/
-
-        @ApiIgnore @RequestBody VfileMenu vfileMenu){
+    public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu){
         Integer page=vfileMenu.getPage();
         Integer results=vfileMenu.getResults();
-        //if(vfil)
-        System.out.println(page);
-        System.out.println(results);
-        System.out.println(vfileMenu.getFileYear());
+
         if (page == null || page <= 0) {
             page = 1;
         }
         if (results == null || results <= 0)
             results = 10;
+
         int offset=(page - 1) * results;
 
         return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu),
@@ -210,4 +201,34 @@ public class VfileMenuController {
 
     }
 
+    /**查询数据库中所有的不同年份
+     * @return List<Integer>
+     */
+    @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());
+        }
+
+        return ResponseResult.success(yearList);
+    }
+
+    /**查询数据库中所有的不同区域
+     * @return List<String>
+     */
+    @ApiOperation(value="查询所有区域",notes="不需要传参数")
+    @PostMapping("/AllRegion")
+    public ResponseResult distinctAllRegion(){
+        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
+        List<String> regionList = new ArrayList<String>();
+        for(int i=0;i<vfileMenuList.size();i++){
+            regionList.add(vfileMenuList.get(i).getRegion());
+        }
+
+        return ResponseResult.success(regionList);
+    }
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
index 3bc3c2b786ea83c2703cbd40f18408f83f3cc010..b58e07982315936883c3ff2dcee7c93a4a0983a5 100644
--- a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
@@ -40,4 +40,8 @@ public interface VfileMenuMapper extends Mapper<VfileMenu> {
 
     public Integer countFilesByObj(VfileMenu vfileMenu);
 
+    public List<VfileMenu> distinctAllYear();
+
+    public List<VfileMenu> distinctAllRegion();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/VfileMenuService.java b/src/main/java/com/cetc32/dh/service/VfileMenuService.java
index a9bf75cf2c4211f9163f0f4e40ea1fc970d8c964..272884a8d2dec0a20ffdcace37f9c23dd83de251 100644
--- a/src/main/java/com/cetc32/dh/service/VfileMenuService.java
+++ b/src/main/java/com/cetc32/dh/service/VfileMenuService.java
@@ -37,5 +37,8 @@ public interface VfileMenuService {
 
     public Integer countFilesByObj(VfileMenu vfileMenu);
 
+    public List<VfileMenu> distinctAllYear();
+
+    public List<VfileMenu> distinctAllRegion();
 
 }
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 35f677cba15f001b3ecf63e6f5a432c280d58736..9a71fd44461ac06b2014d0bc3af6364bf5f6cda3 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -102,4 +102,20 @@ public class VfileMenuServiceImpl implements VfileMenuService {
     public Integer countFilesByObj(VfileMenu vfileMenu){
         return vfileMenuMapper.countFilesByObj(vfileMenu);
     }
+
+    /**查询数据库中所有的不同年份
+     * @return List<VfileMenu>
+     */
+    @Override
+    public List<VfileMenu> distinctAllYear(){
+        return vfileMenuMapper.distinctAllYear();
+    }
+
+    /**查询数据库中所有的不同区域
+     * @return List<VfileMenu>
+     */
+    @Override
+    public List<VfileMenu> distinctAllRegion(){
+        return vfileMenuMapper.distinctAllRegion();
+    }
 }
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index 42aab3bc738df6568d81568ab77b5081a4eaeccc..d7e2f255e36210bb08187a4026b616bf09536136 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -107,4 +107,15 @@
             </if>
         </where>
     </select>
+
+    <select id="distinctAllYear" resultType="com.cetc32.dh.entity.VfileMenu" >
+        select distinct file_year from vfile_menu
+    </select>
+
+    <select id="distinctAllRegion" resultType="com.cetc32.dh.entity.VfileMenu" >
+        select distinct region from vfile_menu
+    </select>
+
+
+
 </mapper>
\ No newline at end of file