diff --git a/pom.xml b/pom.xml
index 4acb48407da3243acbbcd3076ff81ce805de3d32..cb41107373027e955f7fb8cc332f45156b025d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,12 @@
     </properties>
 
     <dependencies>
+        <!--<dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -37,7 +43,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/src/main/java/com/cetc32/dh/common/bean/CommonVariable.java b/src/main/java/com/cetc32/dh/common/bean/CommonVariable.java
new file mode 100644
index 0000000000000000000000000000000000000000..786e0ca6e428f3c3e34379fc9be7396cc8750bf4
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/common/bean/CommonVariable.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/30 下午1:20
+ ******************************************************************************/
+package com.cetc32.dh.common.bean;
+
+import com.google.common.collect.Sets;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+public  final  class CommonVariable {
+    public static final String EAST_ZQ_CODE="01";
+    public static final String WEST_ZQ_CODE="02";
+    public static final String SOUTH_ZQ_CODE="03";
+    public static final String NORTH_ZQ_CODE="04";
+    public static final String CENTRAL_ZQ_CODE="05";
+    public static final String EAST_ZQ_NAME="EastZQ";
+    public static final String WEST_ZQ_NAME="WestZQ";
+    public static final String SOUTH_ZQ_NAME="SouthZQ";
+    public static final String NORTH_ZQ_NAME="NorthZQ";
+    public static final String CENTRAL_ZQ_NAME="CentralZQ";
+    public static final HashSet<String> sets = new HashSet<>( Arrays.asList(new String[]{EAST_ZQ_CODE, WEST_ZQ_CODE, NORTH_ZQ_CODE, SOUTH_ZQ_CODE, CENTRAL_ZQ_CODE}));
+}
diff --git a/src/main/java/com/cetc32/dh/common/TreeData.java b/src/main/java/com/cetc32/dh/common/bean/TreeData.java
similarity index 99%
rename from src/main/java/com/cetc32/dh/common/TreeData.java
rename to src/main/java/com/cetc32/dh/common/bean/TreeData.java
index b7afbde1dee36f166c8bb5d5d365f087580b555a..2241a775851ebc29f60c191fcf2e8c773d3c1a74 100644
--- a/src/main/java/com/cetc32/dh/common/TreeData.java
+++ b/src/main/java/com/cetc32/dh/common/bean/TreeData.java
@@ -3,9 +3,9 @@
  * @Description：
  * @Author ：徐文远
  * @version：1.0
- * @date ： 2021/9/15 下午2:36
+ * @date ： 2021/9/30 下午12:00
  ******************************************************************************/
-package com.cetc32.dh.common;
+package com.cetc32.dh.common.bean;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/src/main/java/com/cetc32/dh/common/TreeNode.java b/src/main/java/com/cetc32/dh/common/bean/TreeNode.java
similarity index 84%
rename from src/main/java/com/cetc32/dh/common/TreeNode.java
rename to src/main/java/com/cetc32/dh/common/bean/TreeNode.java
index 4c5a47c0679c1cfde8b414e0fe538b0edef6c76b..e8ee27e58debd4f1bd546769583dffceec0841ec 100644
--- a/src/main/java/com/cetc32/dh/common/TreeNode.java
+++ b/src/main/java/com/cetc32/dh/common/bean/TreeNode.java
@@ -3,9 +3,9 @@
  * @Description：
  * @Author ：徐文远
  * @version：1.0
- * @date ： 2021/9/15 下午3:26
+ * @date ： 2021/9/30 下午12:00
  ******************************************************************************/
-package com.cetc32.dh.common;
+package com.cetc32.dh.common.bean;
 
 public interface TreeNode {
     String getKey();
diff --git a/src/main/java/com/cetc32/dh/common/bean/UserAreaPermision.java b/src/main/java/com/cetc32/dh/common/bean/UserAreaPermision.java
new file mode 100644
index 0000000000000000000000000000000000000000..64757c76a4eef58583074a5dd16e5c7f8fc0dc4a
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/common/bean/UserAreaPermision.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/30 下午12:01
+ ******************************************************************************/
+package com.cetc32.dh.common.bean;
+
+import com.cetc32.webutil.common.bean.LoginUser;
+
+import java.util.List;
+import java.util.Random;
+
+public class UserAreaPermision{
+    List<String> polygon;
+    List<String>areaCode;
+    public UserAreaPermision(){}
+
+    /*public UserAreaPermision(LoginUser user){
+        setAreaCode(user.getAreacode());
+    }*/
+
+    public List<String> getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(List<String> polygon) {
+        this.polygon = polygon;
+    }
+
+    public List<String> getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(List<String> areaCode) {
+        if(areaCode!=null && areaCode.size()>0) {
+            if (!CommonVariable.sets.contains(areaCode.get(new Random().nextInt(areaCode.size())))) {
+                this.areaCode =areaCode;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/config/DataManageConfig.java b/src/main/java/com/cetc32/dh/config/DataManageConfig.java
index d2b8efda7e32e86613ceeabdfc13a6dfaff3aeaa..5804a78f046b008b97ecc7b90051a73a1145a502 100644
--- a/src/main/java/com/cetc32/dh/config/DataManageConfig.java
+++ b/src/main/java/com/cetc32/dh/config/DataManageConfig.java
@@ -113,7 +113,7 @@ public class DataManageConfig implements WebMvcConfigurer {
                         //是否发送Cookie信息
                         .allowCredentials(true)
                         //放行哪些原始域(请求方式)
-                        .allowedMethods("GET","POST", "PUT", "DELETE")
+                        .allowedMethods("GET","POST", "PUT", "DELETE","OPTIONS")
                         //放行哪些原始域(头部信息)
                         .allowedHeaders("*")
                         //暴露哪些头部信息（因为跨域访问默认不能获取全部头部信息）
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 619b02c46665c800d7ad5f4bb50198b9455c8d93..6a31e710dd5fa9e6c96f4f5cda2fb3853cd842ef 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -8,9 +8,7 @@ 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.DataFile;
-import com.cetc32.dh.entity.DataMenu;
-import com.cetc32.dh.entity.ZipFile;
+import com.cetc32.dh.entity.*;
 import com.cetc32.dh.service.*;
 import com.cetc32.dh.utils.FileUtil;
 import com.cetc32.webutil.common.annotations.LoginSkipped;
@@ -21,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +31,7 @@ import java.io.*;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -43,17 +43,21 @@ import java.util.zip.ZipOutputStream;
  * @date: 2020/10/14
  * 备注:无
  */
+
 @RestController
 @RequestMapping("/rest/import/")
 public class DataFileController {
 
-
   @Autowired
   DataFileService dataFileService;
   @Autowired
   DataMenuService dataMenuService;
   @Autowired
   ZipFileService zipFileService;
+  @Autowired
+  DataAreaService dataAreaService;
+  @Autowired
+  CityGeomService cityGeomService;
   @Value("${upLoadPath}")
   String upLoadPath;
   @Value("${upDatePath}")
@@ -155,13 +159,13 @@ public class DataFileController {
     @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""),
   })
   public ResponseResult delData(@RequestBody Map<String, Object> map) {
-    System.out.println(map);
+//    System.out.println(map);
     List<String> ids = new ArrayList<>();
     DataFile dataFile = new DataFile();
     int sum = 0;
     ids = (List<String>) map.get("ids");
-    Integer userId =  SecurityUserUtil.getUser().getId();
-    System.out.println(userId);
+//    Integer userId =  SecurityUserUtil.getUser().getId();
+//    System.out.println(userId);
 //        String userName = null;
 //        if ((adminUserService.getUserById(userId)) != null) {
 //            userName = adminUserService.getUserById(userId).getSysUserName();
@@ -332,63 +336,40 @@ public class DataFileController {
   public ResponseResult DataSub(@RequestBody DataFile dataFile) throws Exception {
     if(null == dataFile)
       return ResponseResult.error("无效的参数");
-    if (dataFile.getRegionList() != null) {
-      String region = dataFile.getRegionList().toString();
-      region = region.replace("[", "");
-      region = region.replace("]", "");
-      dataFile.setRegion(region);
-    }
+    //List<DataArea> dataAreas = new ArrayList<>();
+
+    //packageDataFile(dataFile);
+
     String upCachePath = upLoadPath + "_user" + SecurityUserUtil.getUser().getId();
     String fileName = null;
     Integer count = 0;
-    dataFile.setStatus("未审批");
-    dataFile.setSubmitor(SecurityUserUtil.getUser().getUsername());
-    DataFile dataFile_new = dataFile;
-    DataFile dataFile_new2 = dataFile;
-    String path_move = storePath + File.separator+dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl();
+    String path_move = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl();
     FileUtil.makeDir(path_move);
     File baseFile = new File(upCachePath);
     if (baseFile == null) {
       return ResponseResult.error("未上传文件");
     }
     File[] files = baseFile.listFiles();
-    File file = null;
+    Integer dataId =-1;
     for (int i = 0; i < files.length; i++) {
       dataFile.setImgExample(null);
-      file = files[i];
-      String oldFileName=file.getName();
-      if (file.isDirectory()) {
-        List<String> allFiles = FileUtil.getAllFile(upCachePath + File.separator + oldFileName);
-        dataFile.setFileNumbers(allFiles.size());
-        dataFile.setFileSize(FileUtils.sizeOfDirectory(file));
-        fileName = FileUtil.nameAddTime(oldFileName);
-        for (int j = 0; j <allFiles.size() ; j++) {
-          String name = allFiles.get(j);
-          if (name.contains("jpeg") || name.contains("jpg") || name.contains("png") || name.contains("gif")) {
-            dataFile.setImgExample((path_move+name.replace(upCachePath,"")).replace(oldFileName,fileName));
-            break;
-          }
-        }
-        file.renameTo(new File(upCachePath + File.separator + fileName));
-      } else {
-        fileName = file.getName();
-        dataFile.setFileSize(file.length());
-        dataFile.setFileNumbers(1);
-        if(fileName.contains("jpeg")||fileName.contains("jpg")||fileName.contains("png")||fileName.contains("gif")){
-          dataFile.setImgExample((path_move+File.separator+fileName.replace(upCachePath,"")));
-          break;
-        }
-      }
+      fileName = moveUploadedFiles(dataFile, upCachePath, path_move, files[i]);
+      if (fileName == null)
+        break;
       dataFile.setFileName(fileName);
-      String path = storePath+dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl() + File.separator + fileName;
+      String path = path_move + File.separator + fileName;
       dataFile.setFilePath(path);
-      dataFile_new = dataFile;
-      if (dataFileService.insertDataFile(dataFile_new) >= 0) {
+      //dataFile_new = dataFile;
+      if (dataFileService.insertDataFile(dataFile) > 0) {
+        System.out.println("***************************************"+dataFile.getId());
+
         count++;
+        //data_area表建立关系
       }
-      dataFile_new2 = dataFile_new;
-      dataFile_new2.setId(dataFile_new.getId() + i + 1);
-      dataFile_new.setId(dataFile_new2.getId());
+
+      //dataFile_new2 = dataFile_new;
+      /*dataFile_new2.setId(dataFile_new.getId() + i + 1);
+      dataFile_new.setId(dataFile_new2.getId());*/
     }
 
     if (FileUtil.copyFolder(upCachePath, path_move) && count == files.length) {
@@ -399,6 +380,59 @@ public class DataFileController {
     return ResponseResult.error("表单信息提交失败！");
   }
 
+  /************************************************************************
+   * 封装前端提交的DataFile实体类型，校验RegionList中区域信息是否是通用的areaCode
+   * 如果是这提取其对应CityName ,如果校验RegionList中区域信息为省市，则转化为areaCode
+   * @param dataFile  需要封装的datafile数据实体
+   * @return 无
+   * **********************************************************************/
+  /*public  void packageDataFile(DataFile dataFile) {
+    List<String> rgList =dataFile.getRegionList();
+    if (rgList != null && rgList.size()>0) {
+      if(Pattern.matches("^\\d{6}$",  //校验6位数字编码
+              rgList.get((new Random().nextInt(rgList.size()))).trim())){ //随即选取一个进行校验
+        dataFile.setRegion(cityGeomService.selectCityInCodes(rgList));
+      }else if(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$",
+                      rgList.get((new Random().nextInt(rgList.size()))).trim())){//校验数字编码失败，则表示可能为文字
+        dataFile.setRegion(rgList.toString()
+                .replace("[", "")
+                .replace("]", ""));
+        //根据城市名称获取城市areaCode
+        dataFile.setRegionList(cityGeomService.selectCodesInArea(rgList));
+      }
+    }
+    dataFile.setStatus("未审批");
+    dataFile.setSubmitor(SecurityUserUtil.getUser().getUsername());
+  }*/
+
+  private String moveUploadedFiles( DataFile dataFile, String upCachePath, String path_move, File file) {
+    String fileName;
+    String oldFileName=file.getName();
+    if (file.isDirectory()) {
+      List<String> allFiles = FileUtil.getAllFile(upCachePath + File.separator + oldFileName);
+      dataFile.setFileNumbers(allFiles.size());
+      dataFile.setFileSize(FileUtils.sizeOfDirectory(file));
+      fileName = FileUtil.nameAddTime(oldFileName);
+      for (int j = 0; j <allFiles.size() ; j++) {
+        String name = allFiles.get(j);
+        if (name.contains("jpeg") || name.contains("jpg") || name.contains("png") || name.contains("gif")) {
+          dataFile.setImgExample((path_move+name.replace(upCachePath,"")).replace(oldFileName,fileName));
+          break;
+        }
+      }
+      file.renameTo(new File(upCachePath + File.separator + fileName));
+    } else {
+      fileName = file.getName();
+      dataFile.setFileSize(file.length());
+      dataFile.setFileNumbers(1);
+      if(fileName.contains("jpeg")||fileName.contains("jpg")||fileName.contains("png")||fileName.contains("gif")){
+        dataFile.setImgExample((path_move+File.separator+fileName.replace(upCachePath,"")));
+        return null;
+      }
+    }
+    return fileName;
+  }
+
   /**
    * 记录数据详情展示
    *
@@ -532,7 +566,7 @@ public class DataFileController {
       String filePath = dataFileService.queryById(fileId).getFilePath();
       filePath = filePath.replace("\\", File.separator);
       filePath = filePath.replace("/", File.separator);
-      filePath = storePath + File.separator + filePath;
+      //filePath = storePath + File.separator + filePath;
       if (!FileUtil.isDirectory(filePath)) {
         FileUtil.downloadFile(response, fileName, filePath);
       }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
index efa0b06722a8e2ab55dd887b748ea95e4b9f3927..532372281ebc8f46095fb55285551f705df52857 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -259,28 +260,18 @@ public class OtherInterfaceController {
 
     @ApiOperation(value = "采集数据上报")
     @PostMapping("/import/collection")
-    @LoginSkipped
+    //@LoginSkipped
     public ResponseData DataCollection(@RequestBody DataPlpCollect data) {
         if(data.getEventType()==null
                 && verifyEnventType(data)) {
-                return ResponseData.error("无法识别的数据类型");
+                return ResponseData.error("无法识别的时间类型");
         }
-        if(data.getType() !=null){
-            switch ( data.getType()){
-                case "120400":case "120500":case "120600":case "120700":
-                case "130200":case "140200":case "260100":case "270100":
-                case "140502":case "270201":case "140508":case "140510":
-                case "140513":  /// poionts
-                case "120800":case "140100":case "140300":case "140516":
-                case "140523":case "160200":// lines
-                case "160400":case "161103":case "220100":case "220200"://ployons
-                    break;
-                default:return ResponseData.error("数据类型不在已知范围内");
-            }
+        if(data.getType() ==null || !verifyDataType(data)){
+            return ResponseData.error("数据类型不在已知范围内");
         }
-        //data.setSubmitor(SecurityUserUtil.getUser().getUsername());
+        data.setSubmitor(SecurityUserUtil.getUser().getUsername());
         String msg="操作成功!";
-        String filePath = upLoadPath + File.separator+"collect"//+File.separator+SecurityUserUtil.getUser().getId()
+        String filePath = upLoadPath + File.separator+"collect"+File.separator+SecurityUserUtil.getUser().getId()
                 +File.separator+System.currentTimeMillis() ;
         if(null != data.getPhoto()){
             String[] base64Data = data.getPhoto();
@@ -326,6 +317,21 @@ public class OtherInterfaceController {
 
     }
 
+    @Nullable
+    private boolean verifyDataType(@RequestBody DataPlpCollect data) {
+        switch ( data.getType()){
+            case "120400":case "120500":case "120600":case "120700":
+            case "130200":case "140200":case "260100":case "270100":
+            case "140502":case "270201":case "140508":case "140510":
+            case "140513":  /// poionts
+            case "120800":case "140100":case "140300":case "140516":
+            case "140523":case "160200":// lines
+            case "160400":case "161103":case "220100":case "220200"://ployons
+                return true;
+            default:return false;
+        }
+    }
+
     private int saveBase64File(String filePath, int errFiles, int i, String[] d, String inffix, Method method,DataPlpCollect obj) {
         String dataPrix;
         String datab;
diff --git a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java b/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java
deleted file mode 100644
index dcb354ea299183f3d0f26171b938b794e11483f8..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @Description: AdminUserDTO实体类
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.dto;
-
-import com.cetc32.dh.entity.NumberS;
-import lombok.Data;
-
-;
-
-/**
- * @Title: AdminUserDTO
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/12/3 12:13
- */
-@Data
-public class AdminUserDTO extends NumberS {
-
-    /**
-     * id
-     */
-    private Integer id;
-
-    /**
-     * 用户名称
-     */
-    private String sysUserName;
-
-    /**
-     * 用户密码
-     */
-    private String sysUserPwd;
-
-    /**
-     * 角色id
-     */
-    private String roleId;
-
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
-    /**
-     * 用户手机
-     */
-    private String userPhone;
-
-    /**
-     * regTime
-     */
-    private String regTime;
-
-    /**
-     * 用户状态
-     */
-    private Integer userStatus;
-    /**
-     * 区域代码
-     */
-    private String areacode;
-    /**
-     * 密级
-     */
-    private Integer security;
-    /**
-     * 用户部门
-     */
-    private Integer department;
-
-}
diff --git a/src/main/java/com/cetc32/dh/dto/LoginDTO.java b/src/main/java/com/cetc32/dh/dto/LoginDTO.java
deleted file mode 100644
index a1d522b3485f47f21e5988b156b141db8ccbd597..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/dto/LoginDTO.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * @Description: 登陆实体
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.dto;
-
-/**
- * @Title: LoginDTO
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-public class LoginDTO {
-
-    /**
-     * 用户名称
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * rememberMe
-     */
-    private String rememberMe;
-
-    /**
-     * 获取用户名称
-     * @return username
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * 设置用户名称
-     * @param username
-     */
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    /**
-     * 获取用户密码
-     * @return password
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * 设置用户密码
-     * @param password
-     */
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    /**
-     * 获取rememberMe
-     * @return rememberMe
-     */
-    public String getRememberMe() {
-        return rememberMe;
-    }
-
-    /**
-     * 设置rememberMe
-     * @param rememberMe
-     */
-    public void setRememberMe(String rememberMe) {
-        this.rememberMe = rememberMe;
-    }
-
-    /**
-     * 将登陆实体转换成字符串
-     */
-    @Override
-    public String toString() {
-        return "LoginDTO{" +
-                "username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                ", rememberMe='" + rememberMe + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/com/cetc32/dh/dto/PermissionDTO.java b/src/main/java/com/cetc32/dh/dto/PermissionDTO.java
deleted file mode 100644
index d9dfb994084d993b3d14a7d9706b272248fb8fff..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/dto/PermissionDTO.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * @Description: 权限PermissionDTO实体
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.dto;
-
-import com.cetc32.dh.entity.NumberS;
-import lombok.Data;
-import java.util.List;
-
-/**
- * @Title: PermissionDTO
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/30 11:22
- */
-@Data
-public class PermissionDTO extends NumberS {
-
-    /**
-     * id
-     */
-    private Integer id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * pid
-     */
-    private Integer pid;
-
-    /**
-     * pname
-     */
-    private String pname;
-
-    /**
-     * descpt
-     */
-    private String descpt;
-
-    /**
-     * url
-     */
-    private String url;
-
-    /**
-     * 创建时间
-     */
-    private String createTime;
-
-    /**
-     * 更新时间
-     */
-    private String updateTime;
-
-    /**
-     * delFlag
-     */
-    private Integer delFlag;
-
-    /**
-     * 获取id
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * 设置id
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取名称
-     * @return name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置名称
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取pid
-     * @return pid
-     */
-    public Integer getPid() {
-        return pid;
-    }
-
-    /**
-     * 设置pid
-     * @param pid
-     */
-    public void setPid(Integer pid) {
-        this.pid = pid;
-    }
-
-    /**
-     * 获取pname
-     * @return pname
-     */
-    public String getPname() {
-        return pname;
-    }
-
-    /**
-     * 设置pname
-     * @param pname
-     */
-    public void setPname(String pname) {
-        this.pname = pname;
-    }
-
-    /**
-     * 获取descpt
-     * @return descpt
-     */
-    public String getDescpt() {
-        return descpt;
-    }
-
-    /**
-     * 设置descpt
-     * @param descpt
-     */
-    public void setDescpt(String descpt) {
-        this.descpt = descpt;
-    }
-
-    /**
-     * 获取url
-     * @return url
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * 设置url
-     * @param url
-     */
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    /**
-     * 获取createTime
-     * @return createTime
-     */
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置createTime
-     * @param createTime
-     */
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取updateTime
-     * @return updateTime
-     */
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置updateTime
-     * @param updateTime
-     */
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取delFlag
-     * @return delFlag
-     */
-    public Integer getDelFlag() {
-        return delFlag;
-    }
-
-    /**
-     * 设置delFlag
-     * @param delFlag
-     */
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    /**
-     * 孩子childrens
-     */
-    List<PermissionDTO> childrens;
-
-    /**
-     * 获取childrens
-     * @return childrens
-     */
-    public List<PermissionDTO> getChildrens() {
-        return childrens;
-    }
-
-    /**
-     * 设置childrens
-     * @param childrens
-     */
-    public void setChildrens(List<PermissionDTO> childrens) {
-        this.childrens = childrens;
-    }
-
-
-}
diff --git a/src/main/java/com/cetc32/dh/dto/UserSearchDTO.java b/src/main/java/com/cetc32/dh/dto/UserSearchDTO.java
deleted file mode 100644
index 1bf73699624a1f8a63ea567afd50eaa49031b2eb..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/dto/UserSearchDTO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @Description: 用户查询实体UserSearchDTO
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.dto;
-
-import lombok.Data;
-
-/**
- * @Title: UserSearchDTO
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-@Data
-public class UserSearchDTO {
-    /**
-     * 用户名称
-     */
-    private String sysUserName;
-
-    /**
-     * 用户手机
-     */
-    private String userPhone;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-
-}
diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java
index 714a0ea8453b0991f48470845b4731e4f3edd0a6..c60207180ccd499c12c702cb11776ce595150e9d 100644
--- a/src/main/java/com/cetc32/dh/entity/CityGeom.java
+++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java
@@ -7,7 +7,7 @@
  ******************************************************************************/
 package com.cetc32.dh.entity;
 
-import com.cetc32.dh.common.TreeNode;
+import com.cetc32.dh.common.bean.TreeNode;
 
 import javax.persistence.Column;
 import javax.persistence.Id;
@@ -18,6 +18,8 @@ public class CityGeom implements TreeNode {
 
     private String city;
 
+    private String geom;
+
     @Id
     @Column(name = "city_code")
     private String cityCode;
@@ -31,6 +33,14 @@ public class CityGeom implements TreeNode {
     @Column( name ="polygon_text")
     private String polygonText;
 
+    public String getGeom() {
+        return geom;
+    }
+
+    public void setGeom(String geom) {
+        this.geom = geom;
+    }
+
     public String getCity() {
         return city;
     }
diff --git a/src/main/java/com/cetc32/dh/entity/DataArea.java b/src/main/java/com/cetc32/dh/entity/DataArea.java
new file mode 100644
index 0000000000000000000000000000000000000000..c44a07b7232aec0edeb5abb4afaff67de4a55092
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/DataArea.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/16 下午1:25
+ ******************************************************************************/
+package com.cetc32.dh.entity;
+
+public class DataArea {
+    Long dataId;
+    Long menuId;
+    String areaCode;
+    public DataArea(){}
+    public DataArea(Long dataId,String areaCode,Long menuId){
+        this.dataId=dataId;
+        this.areaCode =areaCode;
+        this.menuId = menuId;
+    }
+    public Long getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(Long dataId) {
+        this.dataId = dataId;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public Long getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId) {
+        this.menuId = menuId;
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/ZQArea.java b/src/main/java/com/cetc32/dh/entity/ZQArea.java
new file mode 100644
index 0000000000000000000000000000000000000000..22ea6a695d1ed47b2a96901bbf8d289a07d335ce
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/ZQArea.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/10/8 下午4:36
+ ******************************************************************************/
+package com.cetc32.dh.entity;
+
+public class ZQArea {
+    private String id;
+    private String zqName;
+    private String polygon;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getZqName() {
+        return zqName;
+    }
+
+    public void setZqName(String zqName) {
+        this.zqName = zqName;
+    }
+
+    public String getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(String polygon) {
+        this.polygon = polygon;
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
index 7c743f8aa48de56af9d73b9dc990567c6522b13e..fdb1c09dd781189112a6a8a8a610e9a38cbf672f 100644
--- a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
@@ -16,7 +16,11 @@ import java.util.List;
 
 @Repository
 public interface CityGeomMapper extends Mapper<CityGeom> {
-    List<CityGeom> selectCityTree(@Param("proCode")String proCode) ;
+    public List<CityGeom> selectCityTree(@Param("proCode")String proCode) ;
+
+    public String selectCityInCodes(  List<String> areaCodes);
+
+    List<String> selectCodesInArea(List<String> cities);
 
     public int updateByName(CityGeom cityGeom);
 
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..4bfa80221b9f5cd592f685bb706d77fa707639cb
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/16 下午1:36
+ ******************************************************************************/
+package com.cetc32.dh.mybatis;
+
+import com.cetc32.dh.entity.DataArea;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+@Repository
+public interface DataAreaMapper {
+    public Integer insertArea(List<DataArea> areaList);
+    public Integer deleteAreaByDataId(@Param("dataId")Long dataId);
+}
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
index 09b453279c26c40e73b615d3171506e749974c0a..7011081d79788dfcf05fdfb63f83db09fcda85c8 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
@@ -6,7 +6,9 @@
  ******************************************************************************/
 package com.cetc32.dh.mybatis;
 
+import com.cetc32.dh.common.bean.UserAreaPermision;
 import com.cetc32.dh.entity.DataFile;
+import com.cetc32.webutil.common.bean.LoginUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
@@ -162,4 +164,24 @@ public interface DataFileMapper extends Mapper<DataFile> {
    * @return 返回结果
    */
   public Integer fileNumCount(Integer menuId);
+
+  /***
+   *  基于当前用户的dataFile获取
+   * @param dataFile 搜索参数
+   * @param user  用户信息
+   * @param limit 个数
+   * @param offset 偏移量
+   * **/
+  public List<DataFile> selectFilesHasPermission(@Param("offset") Integer offset, @Param("limit") Integer limit,
+                                                 @Param("data")DataFile dataFile, @Param("user")UserAreaPermision user,
+                                                 @Param("polygons") List<String > polygons);
+
+  /***
+   *  基于当前用户的dataFile个数获取
+   * @param dataFile 搜索参数
+   * @param user  用户信息
+   * **/
+  public Long countFilesHasPermission(@Param("data")DataFile dataFile,
+                                      @Param("user") UserAreaPermision user,
+                                      @Param("polygons") List<String > polygons);
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/ZqAreaMapper.java b/src/main/java/com/cetc32/dh/mybatis/ZqAreaMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..162d0d22567551aaabe0bf5cc84d8ea5347b9317
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/mybatis/ZqAreaMapper.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/10/8 下午4:35
+ ******************************************************************************/
+package com.cetc32.dh.mybatis;
+
+import com.cetc32.dh.entity.ZQArea;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ZqAreaMapper {
+    List<ZQArea> selectByZqId(@Param("ids") List<String> ids);
+    List<String> selectAreaByZqId(@Param("ids") List<String> ids);
+}
diff --git a/src/main/java/com/cetc32/dh/service/CityGeomService.java b/src/main/java/com/cetc32/dh/service/CityGeomService.java
index 6b7653331df044e05e50422fb9f40c2f28d2f35e..742879d733113c5e55cecb563c58ad6a744e341f 100644
--- a/src/main/java/com/cetc32/dh/service/CityGeomService.java
+++ b/src/main/java/com/cetc32/dh/service/CityGeomService.java
@@ -7,7 +7,7 @@
  ******************************************************************************/
 package com.cetc32.dh.service;
 
-import com.cetc32.dh.common.TreeData;
+import com.cetc32.dh.common.bean.TreeData;
 import com.cetc32.dh.entity.CityGeom;
 import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataPlp;
@@ -18,7 +18,10 @@ import java.util.Set;
 
 public interface CityGeomService {
 
-  List<TreeData> selectTreeData(String proCode);
+    List<TreeData> selectTreeData(String proCode);
+    String selectCityInCodes(  List<String> areaCodes);
+    List<String> selectCodesInArea(List<String> cities);
+
 
   public int updateByName(CityGeom cityGeom);
 
diff --git a/src/main/java/com/cetc32/dh/service/DataAreaService.java b/src/main/java/com/cetc32/dh/service/DataAreaService.java
new file mode 100644
index 0000000000000000000000000000000000000000..9feb01ef2cb700c6ff23bd586e80f691bd86dfb1
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/DataAreaService.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/17 下午4:55
+ ******************************************************************************/
+package com.cetc32.dh.service;
+
+import com.cetc32.dh.entity.DataArea;
+
+import java.util.List;
+
+public interface DataAreaService {
+    Integer insertArea(List<DataArea> areaList);
+    Integer deleteAreaByDataId(Long dataId);
+    Integer updateArea(Long dataId,List<DataArea> list);
+}
diff --git a/src/main/java/com/cetc32/dh/service/DataFileService.java b/src/main/java/com/cetc32/dh/service/DataFileService.java
index 6e4f7968b6055d54a5a59b88620b687caf8d6c44..dd6f223aad085ae8735708d8ad93f295f9a9f304 100644
--- a/src/main/java/com/cetc32/dh/service/DataFileService.java
+++ b/src/main/java/com/cetc32/dh/service/DataFileService.java
@@ -160,5 +160,19 @@ public interface DataFileService {
 //     * @return 返回结果
 //     * */
 //    public Integer countTodayData(String date,String status);
+  /**
+   * 根据dataFile实体获取对应DataFile
+   * @param pageNum  页码
+   * @param limit 请求的资源数量
+   * @param data 请求数据
+   * @return 反馈查询到的数据
+   * **/
+  public List<DataFile> selectAuthorizedData(Integer limit ,Integer pageNum,DataFile data);
 
+  /**
+   * 根据dataFile实体获取对应DataFile
+   * @param data 请求数据
+   * @return 反馈查询到的数据总数
+   * **/
+  public Long countAuthorizedData(DataFile data);
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java
index 73c9671006b015b51e7a2870e7e5fea19563a532..d3d7f9288360fb0088786f543ff24a11e8812749 100644
--- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java
@@ -1,6 +1,6 @@
 package com.cetc32.dh.service.impl;
 
-import com.cetc32.dh.common.TreeData;
+import com.cetc32.dh.common.bean.TreeData;
 import com.cetc32.dh.entity.CityGeom;
 import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataPlp;
@@ -190,6 +190,20 @@ public class CityGeomServiceImpl implements CityGeomService {
     return cityGeoms;
   }
 
+  @Override
+  public String selectCityInCodes(List<String> areaCodes) {
+    if(areaCodes ==null || areaCodes.size() ==0)
+      return null;
+    else return cityGeomMapper.selectCityInCodes(areaCodes);
+  }
+
+  @Override
+  public List<String> selectCodesInArea(List<String> cities) {
+    if(cities ==null || cities.size() ==0)
+      return null;
+    else return cityGeomMapper.selectCodesInArea(cities);
+  }
+
 
   @Override
   public Boolean judgePolygonContain(String polygon1, String polygon2) {
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..a1da47edc909b2fd7865dda028044eb385426a0e
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/17 下午4:56
+ ******************************************************************************/
+package com.cetc32.dh.service.impl;
+
+import com.cetc32.dh.entity.DataArea;
+import com.cetc32.dh.mybatis.DataAreaMapper;
+import com.cetc32.dh.service.DataAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DataAreaServiceImpl implements DataAreaService {
+    @Autowired
+    DataAreaMapper dataAreaMapper;
+
+    @Override
+    public Integer insertArea(List<DataArea> areaList) {
+        return dataAreaMapper.insertArea(areaList);
+    }
+
+    @Override
+    public Integer deleteAreaByDataId(Long dataId) {
+        return dataAreaMapper.deleteAreaByDataId(dataId);
+    }
+
+    @Override
+    public Integer updateArea(Long dataId, List<DataArea> list) {
+        dataAreaMapper.deleteAreaByDataId(dataId);
+        dataAreaMapper.insertArea(list);
+        return null;
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java
index 22b5832a37b385b6c895a852274eb554553c1456..8330686285d51ad60e80ee8cc44ecff277fb342e 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java
@@ -6,26 +6,32 @@
  ******************************************************************************/
 package com.cetc32.dh.service.impl;
 
+import com.cetc32.dh.common.bean.CommonVariable;
+import com.cetc32.dh.common.bean.UserAreaPermision;
+import com.cetc32.dh.entity.DataArea;
 import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataMenu;
-import com.cetc32.dh.mybatis.DataFileMapper;
-import com.cetc32.dh.mybatis.DataMenuMapper;
+import com.cetc32.dh.entity.ZQArea;
+import com.cetc32.dh.mybatis.*;
+import com.cetc32.dh.service.CityGeomService;
 import com.cetc32.dh.service.DataFileService;
 import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.utils.FileUtil;
+import com.cetc32.webutil.common.bean.LoginUser;
+import com.cetc32.webutil.common.util.SecurityUserUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -48,6 +54,15 @@ public class DataFileServiceImpl implements DataFileService {
   @Autowired
   public DataMenuService dataMenuService;
 
+  @Autowired
+  public DataAreaMapper dataAreaMapper;
+
+  @Autowired
+  public ZqAreaMapper zqAreaMapper;
+
+  @Autowired
+  public CityGeomService cityGeomService;
+
   /**
    * 统计所有的文件数据个数
    *
@@ -66,7 +81,54 @@ public class DataFileServiceImpl implements DataFileService {
    */
   @Override
   public Integer insertDataFile(DataFile dataFile) {
-    return dataFileMapper.insertOne(dataFile);
+    List<DataArea> dataAreas =new ArrayList<>();
+    packageDataFile(dataFile);
+    Integer id =dataFileMapper.insertOne(dataFile);
+    for(String s:dataFile.getRegionList()){
+      dataAreas .add(new DataArea(Long.valueOf(dataFile.getId()),
+              s,
+              Long.valueOf(dataFile.getMenuId())));
+    }
+    dataAreaMapper.insertArea(dataAreas);
+    return id;
+  }
+  /************************************************************************
+   * 封装前端提交的DataFile实体类型，校验RegionList中区域信息是否是通用的areaCode
+   * 如果是这提取其对应CityName ,如果校验RegionList中区域信息为省市，则转化为areaCode
+   * @param dataFile  需要封装的datafile数据实体
+   * @return 无
+   * **********************************************************************/
+  public  void packageDataFile(DataFile dataFile) {
+    List<String> rgList =dataFile.getRegionList();
+    if (rgList != null && rgList.size()>0) {
+      if(Pattern.matches("^\\d{6}$",  //校验6位数字编码
+              rgList.get((new Random().nextInt(rgList.size()))).trim())){ //随即选取一个进行校验
+        dataFile.setRegion(cityGeomService.selectCityInCodes(rgList));
+      }else if(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$",
+              rgList.get((new Random().nextInt(rgList.size()))).trim())){//校验数字编码失败，则表示可能为文字
+        dataFile.setRegion(rgList.toString()
+                .replace("[", "")
+                .replace("]", ""));
+        //根据城市名称获取城市areaCode
+        dataFile.setRegionList(cityGeomService.selectCodesInArea(rgList));
+      }
+    }else  if(null != dataFile.getRegion()){
+        String[] regions = dataFile.getRegion().split(",");
+      if(Pattern.matches("^\\d{6}$",  //校验6位数字编码
+              regions[(new Random().nextInt(regions.length))].trim())){ //随即选取一个进行校验
+        //rgList.addAll(Arrays.asList(regions));
+        dataFile.setRegionList(Arrays.asList(regions));
+        //如果是区域编码这需要先转换汉字后将areacode存储到RegionList
+        dataFile.setRegion(cityGeomService.selectCityInCodes(dataFile.getRegionList()));
+      }else if(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$",
+              regions[(new Random().nextInt(regions.length))].trim())){//校验数字编码失败，则表示可能为文字
+        //根据城市名称获取城市areaCode
+        dataFile.setRegionList(cityGeomService.selectCodesInArea(Arrays.asList(regions)));
+      }
+
+    }
+    dataFile.setStatus("未审批");
+    dataFile.setSubmitor(SecurityUserUtil.getUser().getUsername());
   }
 
   /**
@@ -402,5 +464,52 @@ public class DataFileServiceImpl implements DataFileService {
     return num;
   }
 
+  /**
+   * 根据dataFile实体获取对应DataFile
+   *
+   * @param limit   请求的资源数量
+   * @param pageNum 页码
+   * @param data    请求数据
+   * @return 反馈查询到的数据
+   **/
+  @Override
+  public List<DataFile> selectAuthorizedData(Integer limit, Integer pageNum, DataFile data) {
+    if(null==limit || limit <=0)
+      return  null;
+    if(pageNum<=0)
+      pageNum=1;
+    Integer offset = limit *(pageNum -1);
+    UserAreaPermision user = getUserAreaPermision();
+    if (user == null) return null;
+    dataFileMapper.selectFilesHasPermission(offset,limit,data,user,user.getPolygon());
+    return null;
+  }
+
+  private UserAreaPermision getUserAreaPermision() {
+    UserAreaPermision user = new UserAreaPermision();
+    LoginUser loginUser = SecurityUserUtil.getUser();
+    if(null == loginUser)
+      return null;
+    List<String > areaCodes = loginUser.getAreacode();
+    if(areaCodes.get(0).length()> CommonVariable.SOUTH_ZQ_CODE.length()) {
+      user.setAreaCode(SecurityUserUtil.getUser().getAreacode());
+    } else {
+      user.setPolygon(zqAreaMapper.selectAreaByZqId(loginUser.getAreacode()));
+    }
+    return user;
+  }
+
+  /**
+   * 根据dataFile实体获取对应DataFile
+   *
+   * @param data 请求数据
+   * @return 反馈查询到的数据总数
+   **/
+  @Override
+  public Long countAuthorizedData(DataFile data) {
+    UserAreaPermision user = getUserAreaPermision();
+    if (user == null) return null;
+    return dataFileMapper.countFilesHasPermission(data,user,user.getPolygon());
+  }
 }
 
diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml
index 63068469cf4d095183f5b4c1dbf4591b2c48701f..ebb2d76605a1ed5a56ea64c402147fb97e643a59 100644
--- a/src/main/resources/mapper/CityGeomMapper.xml
+++ b/src/main/resources/mapper/CityGeomMapper.xml
@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cetc32.dh.mybatis.CityGeomMapper" >
     <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.CityGeom" >
-        <result column="province_code" property="province_code" jdbcType="VARCHAR" />
+        <result column="province_code" property="provinceCode" jdbcType="VARCHAR" />
         <result column="province" property="province" jdbcType="VARCHAR" />
-        <result column="city_code" property="city_code" jdbcType="VARCHAR" />
+        <result column="city_code" property="cityCode" jdbcType="VARCHAR" />
         <result column="city" property="city" jdbcType="VARCHAR" />
-        <result column="polygon_text" property="polygon_text" jdbcType="VARCHAR" />
+        <result column="polygon_text" property="polygonText" jdbcType="VARCHAR" />
+        <result column="geom" property="geom" jdbcType="VARCHAR" />
     </resultMap>
     <select id="selectCityTree" resultMap="BaseResultMap" parameterType="java.lang.String">
         select city ,city_code,province,province_code from city_geom
@@ -15,7 +16,7 @@
                 province_code =#{proCode}
             </if>
         </where>
-        order by province_code asc
+        order by city_code asc
     </select >
 
     <update id="updateByName" parameterType="com.cetc32.dh.entity.CityGeom">
@@ -37,13 +38,29 @@
     <select id="queryByName" parameterType="java.lang.String" resultType="com.cetc32.dh.entity.CityGeom">
         select * from city_geom
         where city = #{name ,jdbcType=VARCHAR}
-  </select>
+    </select>
+    <select id="selectCityInCodes"  resultType="java.lang.String">
+        select array_to_string (
+        array(
+        select city from city_geom where  city_code in
+        <foreach collection="list" item="areaCode" open="(" close=")" separator=",">
+            #{areaCode}
+        </foreach>
+        )
+        ,',')
+    </select>
+    <select id="selectCodesInArea"  resultType="java.lang.String">
+        select city_code from city_geom where  city in
+        <foreach collection="list" item="city" open="(" close=")" separator=",">
+            #{city}
+        </foreach>
+    </select>
 
-  <select id="judgePolygonContain" resultType="java.lang.Boolean" parameterType="java.lang.String">
+    <select id="judgePolygonContain" resultType="java.lang.Boolean" parameterType="java.lang.String">
         select st_within( ST_GeomFromText (#{polygon2},4326), ST_GeomFromText (#{polygon1},4326));
-  </select>
+    </select>
 
-  <select id="judgePointContain" resultType="java.lang.Boolean" parameterType="java.lang.String">
+    <select id="judgePointContain" resultType="java.lang.Boolean" parameterType="java.lang.String">
         select ST_Contains( ST_GeomFromText (#{polygon},4326), ST_GeomFromText (#{point},4326));
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/DataAreaMapper.xml b/src/main/resources/mapper/DataAreaMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3eeb846a27cbf3f007d161b6ed64988a4d80170b
--- /dev/null
+++ b/src/main/resources/mapper/DataAreaMapper.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.DataAreaMapper" >
+    <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.DataArea" >
+        <result column="dataid" property="dataId" jdbcType="INTEGER" />
+        <result column="areacode" property="areaCode" jdbcType="VARCHAR" />
+        <result column="menuid" property="menuId" jdbcType="INTEGER" />
+    </resultMap>
+    <insert id="insertArea"  parameterType="com.cetc32.dh.entity.DataArea">
+        insert into data_area(dataid,citycode,menuid)
+        values
+        <foreach collection="list" item="area" separator=",">
+            (#{area.dataId},#{area.areaCode},#{area.menuId})
+        </foreach>
+    </insert >
+    <delete id="deleteAreaByDataId" parameterType="java.lang.Long">
+        delete from data_area where dataid =#{dataId}
+    </delete>
+</mapper>
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index 8758d7bed7ce79c80a72cb2cea0a1676461a6f37..7443c337d1d6a1db5416f9828276cb88ec732b5b 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -40,16 +40,14 @@
     SELECT count(*) FROM data_file
   </select>
 
-  <insert id="insertOne" keyProperty="id" parameterType="com.cetc32.dh.entity.DataFile" useGeneratedKeys="true">
-    <selectKey keyProperty="id" resultType="java.lang.Long" order="BEFORE">
-      SELECT nextval('data_file_id_seq'::regclass) as id
+  <insert id="insertOne" parameterType="com.cetc32.dh.entity.DataFile" >
+    <selectKey keyProperty="id" resultType="java.lang.Long" order="AFTER">
+      SELECT currval('data_file_id_seq'::regclass) as id
     </selectKey>
     insert into data_file
 
     <trim prefix="(" suffix=")" suffixOverrides=",">
 
-      id,
-
       <if test="fileName!= null">
         file_name,
       </if>
@@ -158,8 +156,6 @@
 
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
-      #{id},
-
       <if test="fileName!= null">
         #{fileName ,jdbcType=VARCHAR},
       </if>
@@ -266,7 +262,11 @@
     </trim>
   </insert>
 
-  <insert id="insertGain" keyProperty="id" parameterType="com.cetc32.dh.entity.DataFile" useGeneratedKeys="true">
+  <insert id="insertGain" parameterType="com.cetc32.dh.entity.DataFile" >
+
+    <selectKey keyProperty="id" resultType="java.lang.Long" order="AFTER">
+      SELECT currval('data_file_id_seq'::regclass) as id
+    </selectKey>
     insert into data_file
     <trim prefix="(" suffix=")" suffixOverrides=",">
 
@@ -369,6 +369,7 @@
 
 
     </trim>
+    /*returning id*/
   </insert>
 
   <update id="updateById" parameterType="com.cetc32.dh.entity.DataFile">
@@ -512,6 +513,161 @@
   </select>
 
 
+  <select id="selectFilesHasPermission" resultMap="BaseResultMap">
+    select * from data_file
+    where
+    <if test="data.menuId!= null">
+       menu_id = #{data.menuId} and
+    </if>
+    <if test="data.fileName != null">
+      file_name like #{data.fileName} and
+    </if>
+    <if test="data.fileConfig != null">
+      file_config like #{data.fileConfig} and
+    </if>
+    <if test="data.region != null">
+      region like #{data.region} and
+    </if>
+    <if test="data.fileTime!=null">
+      file_time = #{data.fileTime} and
+    </if>
+    <if test="data.scanLevel!=null">
+       scan_level = #{data.scanLevel} and
+    </if>
+    <if test="data.scale!=null">
+       scale = #{data.scale} and
+    </if>
+    <if test="data.gcs!=null">
+       gcs = #{data.gcs} and
+    </if>
+    <if test="data.status!=null">
+      status = #{data.status} and
+    </if>
+    <if test="data.lan !=null">
+       lan like #{data.lan} and
+    </if>
+    <if test="data.lon !=null">
+       lon like #{data.lon} and
+    </if>
+    <if test="data.startTime != null and data.startTime != ''">
+       file_time &lt;= #{data.endTime}::timestamp  and
+    </if>
+    <if test="data.endTime != null and data.endTime != ''">
+      file_time &gt;= #{data.startTime}::timestamp  and
+    </if>
+    <if test="data.td_end != null and data.td_end != ''">
+      create_time &lt;= #{data.td_end}::timestamp  and
+    </if>
+    <if test="data.td_start != null and data.td_start != ''">
+      create_time &gt;= #{data.td_start}::timestamp and
+    </if>
+    (points is null and
+      id  in (select distinct (dataid) from data_area where menuid = #{data.menuId} and (
+        citycode in
+          <if test = "user.areaCode!=null and user.areaCode != ''">
+
+            <foreach collection="user.areaCode" item="ak" open="(" separator="," close=")">
+              #{ ak }
+            </foreach>
+          </if>
+          <if test = "(user.areaCode==null || user.areaCode == '') and polygons != null and polygons.size()>0 ">
+            (select city_code from city_geom where
+            <foreach collection="polygons" item="p" separator="or" >
+              ST_Contains(ST_GeomFromText(#{p},4326),ST_GeomFromText(polygon_text,4326)))
+            </foreach>
+          </if>
+
+        )
+    ) or (
+      points is not null
+      <if test = "polygons != null and polygons.size()>0">
+        and
+        <foreach collection="polygons" item="p" open="(" separator="or"  close=")">
+          ST_Contains(ST_GeomFromText(#{p},4326),ST_GeomFromText (#{points},4326))
+        </foreach>
+      </if>
+
+    ))
+    order by id desc
+    LIMIT #{limit} OFFSET #{offset}
+  </select>
+  <select id="countFilesHasPermission" resultType="java.lang.Long">
+    select count(*) from data_file
+    where
+    <if test="data.menuId!= null">
+      menu_id = #{data.menuId} and
+    </if>
+    <if test="data.fileName != null">
+      file_name like #{data.fileName} and
+    </if>
+    <if test="data.fileConfig != null">
+      file_config like #{data.fileConfig} and
+    </if>
+    <if test="data.region != null">
+      region like #{data.region} and
+    </if>
+    <if test="data.fileTime!=null">
+      file_time = #{data.fileTime} and
+    </if>
+    <if test="data.scanLevel!=null">
+      scan_level = #{data.scanLevel} and
+    </if>
+    <if test="data.scale!=null">
+      scale = #{data.scale} and
+    </if>
+    <if test="data.gcs!=null">
+      gcs = #{data.gcs} and
+    </if>
+    <if test="data.status!=null">
+      status = #{data.status} and
+    </if>
+    <if test="data.lan !=null">
+      lan like #{data.lan} and
+    </if>
+    <if test="data.lon !=null">
+      lon like #{data.lon} and
+    </if>
+    <if test="data.startTime != null and data.startTime != ''">
+      file_time &lt;= #{data.endTime}::timestamp  and
+    </if>
+    <if test="data.endTime != null and data.endTime != ''">
+      file_time &gt;= #{data.startTime}::timestamp  and
+    </if>
+    <if test="data.td_end != null and data.td_end != ''">
+      create_time &lt;= #{data.td_end}::timestamp  and
+    </if>
+    <if test="data.td_start != null and data.td_start != ''">
+      create_time &gt;= #{data.td_start}::timestamp and
+    </if>
+    (points is null and
+      id  in (select distinct (dataid) from data_area where menuid = #{data.menuId} and (
+          citycode in
+          <if test = "user.areaCode!=null and user.areaCode != ''">
+
+            <foreach collection="user.areaCode" item="ak" open="(" separator="," close=")">
+              #{ ak }
+            </foreach>
+          </if>
+          <if test = "(user.areaCode==null || user.areaCode == '') and polygons != null and polygons.size()>0">
+            (select city_code from city_geom where
+                <foreach collection="polygons" item="p" separator="or" >
+                   ST_Contains(ST_GeomFromText(#{p},4326),ST_GeomFromText(polygon_text,4326)))
+                </foreach>
+          </if>
+
+          )
+    ) or (
+    points is not null
+    <if test = "polygons !=null and polygons != '' and polygons.size()>0">
+      and
+      <foreach collection="polygons" item="p" open="(" separator="or"  close=")">
+        ST_Contains(ST_GeomFromText(#{p},4326),ST_GeomFromText (#{points},4326))
+      </foreach>
+    </if>
+
+    ))
+
+  </select>
   <select id="queryFilesByObj"  parameterType="com.cetc32.dh.entity.DataFile" resultType="com.cetc32.dh.entity.DataFile">
     select * from data_file
     <where>
diff --git a/src/main/resources/mapper/ZqAreaMapper.xml b/src/main/resources/mapper/ZqAreaMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a88c5f22d32f4c67f77af0f1aa045cf31d77661f
--- /dev/null
+++ b/src/main/resources/mapper/ZqAreaMapper.xml
@@ -0,0 +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.ZqAreaMapper" >
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.ZQArea" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="zq_id" property="id" jdbcType="BIGINT" />
+    <result column="zq_name" property="zqName" jdbcType="VARCHAR" />
+    <result column="zq_area" property="polygon" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="selectByZqId"  resultMap="BaseResultMap">
+    select zq_id,zq_name,zq_area
+    from area_zq where zq_id in
+    <foreach collection="ids" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </select>
+
+  <select id="selectAreaByZqId"  resultType="java.lang.String">
+    select zq_area
+    from area_zq where zq_id in
+    <foreach collection="ids" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </select>
+</mapper>
diff --git a/src/main/resources/mysql-connector-java-8.0.21.jar b/src/main/resources/mysql-connector-java-8.0.21.jar
deleted file mode 100644
index 51e270c46ffb0306278259eda00dd7cb3c412b07..0000000000000000000000000000000000000000
Binary files a/src/main/resources/mysql-connector-java-8.0.21.jar and /dev/null differ
diff --git a/src/test/java/com/cetc32/DataAreaTest.java b/src/test/java/com/cetc32/DataAreaTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..01ad8e5362bb03a2fc66cc4a8e96b934fed2610c
--- /dev/null
+++ b/src/test/java/com/cetc32/DataAreaTest.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/18 上午10:52
+ ******************************************************************************/
+package com.cetc32;
+
+
+import com.cetc32.dh.DhApplication;
+import com.cetc32.dh.common.bean.UserAreaPermision;
+import com.cetc32.dh.entity.DataFile;
+import com.cetc32.dh.entity.ZQArea;
+import com.cetc32.dh.mybatis.CityGeomMapper;
+import com.cetc32.dh.mybatis.DataFileMapper;
+import com.cetc32.dh.mybatis.ZqAreaMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DhApplication.class ,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//@WebAppConfiguration
+public class DataAreaTest {
+    @Autowired
+    CityGeomMapper cityGeomMapper;
+    @Autowired
+    ZqAreaMapper zqAreaMapper;
+    @Autowired
+    DataFileMapper dataFileMapper;
+
+    @Test
+    public void datafileList(){
+        DataFile dataFile =new DataFile();
+        UserAreaPermision user =new UserAreaPermision();
+        dataFile.setMenuId(147);
+        List<String > ids =new ArrayList<>();
+        ids.add("150100");
+        ids.add("150200");
+        ids.add("150300");
+        ids.add("150400");
+        ids.add("150500");
+        ids.add("150600");
+        ids.add("150700");
+        ids.add("150800");
+        ids.add("152500");
+        user.setAreaCode(ids);
+        System.out.println(dataFileMapper.selectFilesHasPermission(0,100,dataFile,user,user.getPolygon()));
+        System.out.println(dataFileMapper.countFilesHasPermission(dataFile,user,user.getPolygon()));
+    }
+
+    @Test
+    public void testZqArea(){
+        List<String > ids =new ArrayList<>();
+        ids .add("01");
+        System.out.println("ZQAreas "+zqAreaMapper.selectAreaByZqId(ids));
+    }
+
+    @Test
+    public void TestSelectCityFromAreaCodes(){
+        ArrayList<String> list =new ArrayList();
+        list.add("110000");
+        list.add("150100");
+        list.add("131000");
+        System.out.println(cityGeomMapper.selectCityInCodes(list));
+    }
+
+    @Test
+    public void TestSelectAeraCodeFromCities(){
+        ArrayList<String> list =new ArrayList();
+        list.add("驻马店市");
+        list.add("上海市");
+        list.add("深圳市");
+        System.out.println(cityGeomMapper.selectCodesInArea(list));
+    }
+    @Test
+    public void zhengzebiaodashi(){
+        System.out.println(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$","你1好"));
+    }
+}
diff --git a/src/test/resources/application-dev.yml b/src/test/resources/application-dev.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0ce23a83736f3d92e38fdf6fa27ab57658044cac
--- /dev/null
+++ b/src/test/resources/application-dev.yml
@@ -0,0 +1,88 @@
+server:
+  port: 8081
+  server.connectionTimeout: 18000000
+
+
+
+## redis setting
+#  jedis.pool.host=localhost
+#  jedis.pool.port=6379
+#  jedis.pool.timeout=3000000
+#  jedis.pool.config.maxTotal=100
+#  jedis.pool.config.maxIdle=10
+#  jedis.pool.config.maxWaitMillis=10000
+#
+#
+#  #thymeleaf
+#  spring.thymeleaf.prefix=classpath:/templates/
+#  spring.thymeleaf.suffix=.html
+#  spring.thymeleaf.mode=LEGACYHTML5
+#  spring.thymeleaf.encoding=UTF-8
+#  spring.thymeleaf.cache=false
+
+
+spring:
+  application:
+    name: dhManager
+  datasource:
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    username: postgres
+    password: 123456
+    driver-class-name: org.postgresql.Driver
+
+#  datasource:
+#    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+#    username: root
+#    password: 123
+#        initial-size: 1
+#        min-idle: 1
+#        max-active: 20
+#        test-on-borrow: true
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    type: com.zaxxer.hikari.HikariDataSource
+
+  servlet:
+    multipart:
+      max-file-size: 2GB
+      max-request-size: 2GB
+
+#设置静态资源路径，多个以逗号分隔
+  resources:
+    static-locations: classpath:static/,file:static/
+mybatis:
+    mapper-locations: classpath:mapper/*.xml
+    type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
+    configuration:
+      map-underscore-to-camel-case: true  #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化
+
+generator:
+  targetProject: src/main/java
+  mappers: tk.mybatis.mapper.common.Mapper
+  javaModel-targetPackage: com.cetc32.dh.entity
+  sqlMap-targetPackage: mapper
+  javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
+
+storePath: /root/
+upLoadPath: ${storePath}upLoad
+
+rootPath: /root/daohang/data
+myPath: ${rootPath}myPath
+writePath: ${rootPath}/product
+flowPath: ${rootPath}/flowpath/
+upDatePath: ${rootPath}/updatePath/
+downPath: ${rootPath}/downPath
+eip: http://192.168.1.42:8080/
+sso:
+  authcenter: http://192.168.1.42:8087
+  verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
+  passportUrl: ${sso.authcenter}/?ReturnUrl=
+  defaultLoginRequiredEnable: true
+  permission: S002^*数据管理@/**;数据员@/rest/**;
+  #permission: S001^*业务管理@/**;普通用户@/rest/**;
+  sysurl : http://192.168.1.42:${server.port}
+  sysname : 数据管理系统
+  registerUrl : ${sso.authcenter}/rest/api/sys/sync
+offlineDataMenuId : 151
diff --git a/src/test/resources/application-hubinwin.yml b/src/test/resources/application-hubinwin.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4f5a0ece6803d5d1cdd13bde45fa5ad0cd5a6ad2
--- /dev/null
+++ b/src/test/resources/application-hubinwin.yml
@@ -0,0 +1,81 @@
+server:
+  port: 8081
+  server.connectionTimeout: 18000000
+
+
+
+## redis setting
+#  jedis.pool.host=localhost
+#  jedis.pool.port=6379
+#  jedis.pool.timeout=3000000
+#  jedis.pool.config.maxTotal=100
+#  jedis.pool.config.maxIdle=10
+#  jedis.pool.config.maxWaitMillis=10000
+#
+#
+#  #thymeleaf
+#  spring.thymeleaf.prefix=classpath:/templates/
+#  spring.thymeleaf.suffix=.html
+#  spring.thymeleaf.mode=LEGACYHTML5
+#  spring.thymeleaf.encoding=UTF-8
+#  spring.thymeleaf.cache=false
+
+
+spring:
+  application:
+    name: dhManager
+  datasource:
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    username: postgres
+    password: 123456
+    driver-class-name: org.postgresql.Driver
+
+#  datasource:
+#    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+#    username: root
+#    password: 123
+#        initial-size: 1
+#        min-idle: 1
+#        max-active: 20
+#        test-on-borrow: true
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    type: com.zaxxer.hikari.HikariDataSource
+
+  servlet:
+    multipart:
+      max-file-size: 5GB
+      max-request-size: 5GB
+
+#设置静态资源路径，多个以逗号分隔
+  resources:
+    static-locations: classpath:static/,file:static/
+mybatis:
+    mapper-locations: classpath:mapper/*.xml
+    type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
+    configuration:
+      map-underscore-to-camel-case: true  #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化
+
+generator:
+  targetProject: src/main/java
+  mappers: tk.mybatis.mapper.common.Mapper
+  javaModel-targetPackage: com.cetc32.dh.entity
+  sqlMap-targetPackage: mapper
+  javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
+
+storePath: D:\root
+upLoadPath: ${storePath}\upLoad
+upDatePath: ${storePath}\upDate
+downPath: ${storePath}\Down
+
+rootPath: D:\root\daohang\data
+myPath: ${rootPath}\myPath\
+writePath: ${rootPath}\product
+flowPath: ${rootPath}\flowpath\
+eip: http://192.168.1.5:8080/
+verifyUrl: http://192.168.1.42:8087/rest/auth/verify?token=
+passportUrl: http://192.168.1.42:8087/?ReturnUrl=
+defaultLoginRequiredEnable: true
+
diff --git a/src/test/resources/application-xwy.yml b/src/test/resources/application-xwy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d3e2051b13f9cd3cfb15803c4226596787b3dcbf
--- /dev/null
+++ b/src/test/resources/application-xwy.yml
@@ -0,0 +1,88 @@
+server:
+  port: 8082
+  server.connectionTimeout: 18000000
+
+
+
+## redis setting
+#  jedis.pool.host=localhost
+#  jedis.pool.port=6379
+#  jedis.pool.timeout=3000000
+#  jedis.pool.config.maxTotal=100
+#  jedis.pool.config.maxIdle=10
+#  jedis.pool.config.maxWaitMillis=10000
+#
+#
+#  #thymeleaf
+#  spring.thymeleaf.prefix=classpath:/templates/
+#  spring.thymeleaf.suffix=.html
+#  spring.thymeleaf.mode=LEGACYHTML5
+#  spring.thymeleaf.encoding=UTF-8
+#  spring.thymeleaf.cache=false
+
+
+spring:
+  application:
+    name: dhManager
+  datasource:
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    username: postgres
+    password: 123456
+    driver-class-name: org.postgresql.Driver
+
+  #  datasource:
+  #    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+  #    username: root
+  #    password: 123
+  #        initial-size: 1
+  #        min-idle: 1
+  #        max-active: 20
+  #        test-on-borrow: true
+  #    driver-class-name: com.mysql.cj.jdbc.Driver
+  #    type: com.zaxxer.hikari.HikariDataSource
+
+  servlet:
+    multipart:
+      max-file-size: 5GB
+      max-request-size: 5GB
+
+  #设置静态资源路径，多个以逗号分隔
+  resources:
+    static-locations: classpath:static/,file:static/
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
+  configuration:
+    map-underscore-to-camel-case: true  #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化
+
+generator:
+  targetProject: src/main/java
+  mappers: tk.mybatis.mapper.common.Mapper
+  javaModel-targetPackage: com.cetc32.dh.entity
+  sqlMap-targetPackage: mapper
+  javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
+
+storePath: /root/
+upLoadPath: ${storePath}upLoad
+
+rootPath: /root/daohang/data
+myPath: ${rootPath}myPath
+writePath: ${rootPath}/product
+flowPath: ${rootPath}/flowpath/
+upDatePath: ${rootPath}/updatePath/
+downPath: ${rootPath}/downPath
+eip: http://192.168.1.206:8080/
+sso:
+  authcenter: http://192.168.1.206:8081
+  verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
+  passportUrl: ${sso.authcenter}/?ReturnUrl=
+  defaultLoginRequiredEnable: true
+  permission: S002^*数据管理@/**;数据员@/rest/**;
+  #permission: S001^*业务管理@/**;普通用户@/rest/**;
+  sysurl : http://192.168.1.206:${server.port}
+  sysname : 数据管理系统
+  registerUrl : ${sso.authcenter}/rest/api/sys/sync
+offlineDataMenuId : 151
diff --git a/src/test/resources/application-xwy2.yml b/src/test/resources/application-xwy2.yml
new file mode 100644
index 0000000000000000000000000000000000000000..931363aa651f0ebfe8616e00623ac3fbcebef450
--- /dev/null
+++ b/src/test/resources/application-xwy2.yml
@@ -0,0 +1,72 @@
+server:
+  port: 8081
+
+spring:
+  application:
+    name: dhManager
+  datasource:
+    url: jdbc:mysql://192.168.1.211:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: 123
+    #    initial-size: 1
+    #    min-idle: 1
+    #    max-active: 20
+    #    test-on-borrow: true
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.zaxxer.hikari.HikariDataSource
+  thymeleaf:
+    cache: false
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+
+  redis:
+    database: 0
+# Redis服务器地址
+    host: 192.168.1.206
+# Redis服务器连接端口
+    port: 6524
+# Redis服务器连接密码（默认为空）
+    password: E6346913E58C304C
+# 连接池最大连接数（使用负值表示没有限制）
+    max-active: 200
+# 连接池最大阻塞等待时间（使用负值表示没有限制）
+    pool:
+      max-wait: -1
+# 连接池中的最大空闲连接
+      max-idle: 10
+# 连接池中的最小空闲连接
+      min-idle: 0
+# 连接超时时间（毫秒）
+    timeout: 1000
+
+
+mybatis:
+    mapper-locations: classpath:mapper/*.xml
+    type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
+    configuration:
+      map-underscore-to-camel-case: true  #配置驼峰命名转换 在进行sql查询和初始化实体时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
+  javaModel-targetPackage: com.cetc32.dh.entity
+  sqlMap-targetPackage: mapper
+  javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
+
+
+rootPath: /root/daohang/data
+myPath: ${rootPath}myPath
+writePath: ${rootPath}/product
+
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..784527fecc8c0f49945bf28d2765d6dde1edb7ef
--- /dev/null
+++ b/src/test/resources/application.yml
@@ -0,0 +1,88 @@
+server:
+  port: 8082
+  server.connectionTimeout: 18000000
+
+
+
+## redis setting
+#  jedis.pool.host=localhost
+#  jedis.pool.port=6379
+#  jedis.pool.timeout=3000000
+#  jedis.pool.config.maxTotal=100
+#  jedis.pool.config.maxIdle=10
+#  jedis.pool.config.maxWaitMillis=10000
+#
+#
+#  #thymeleaf
+#  spring.thymeleaf.prefix=classpath:/templates/
+#  spring.thymeleaf.suffix=.html
+#  spring.thymeleaf.mode=LEGACYHTML5
+#  spring.thymeleaf.encoding=UTF-8
+#  spring.thymeleaf.cache=false
+
+
+spring:
+  application:
+    name: dhManager
+  datasource:
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    username: postgres
+    password: 123456
+    driver-class-name: org.postgresql.Driver
+
+#  datasource:
+#    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+#    username: root
+#    password: 123
+#        initial-size: 1
+#        min-idle: 1
+#        max-active: 20
+#        test-on-borrow: true
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    type: com.zaxxer.hikari.HikariDataSource
+
+  servlet:
+    multipart:
+      max-file-size: 5GB
+      max-request-size: 5GB
+
+#设置静态资源路径，多个以逗号分隔
+  resources:
+    static-locations: classpath:static/,file:static/
+mybatis:
+    mapper-locations: classpath:mapper/*.xml
+    type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
+    configuration:
+      map-underscore-to-camel-case: true  #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化
+
+generator:
+  targetProject: src/main/java
+  mappers: tk.mybatis.mapper.common.Mapper
+  javaModel-targetPackage: com.cetc32.dh.entity
+  sqlMap-targetPackage: mapper
+  javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
+
+storePath: /root/
+upLoadPath: ${storePath}upLoad
+
+rootPath: /root/daohang/data
+myPath: ${rootPath}myPath
+writePath: ${rootPath}/product
+flowPath: ${rootPath}/flowpath/
+upDatePath: ${rootPath}/updatePath/
+downPath: ${rootPath}/downPath
+eip: http://192.168.1.206:8080/
+sso:
+  authcenter: http://192.168.1.206:8081
+  verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
+  passportUrl: ${sso.authcenter}/?ReturnUrl=
+  defaultLoginRequiredEnable: true
+  permission: S002^*数据管理@/**;数据员@/rest/**;
+  #permission: S001^*业务管理@/**;普通用户@/rest/**;
+  sysurl : http://192.168.1.206:${server.port}
+  sysname : 数据管理系统
+  registerUrl : ${sso.authcenter}/rest/api/sys/sync
+offlineDataMenuId : 151
diff --git a/src/test/resources/generator.xml b/src/test/resources/generator.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12e5437e2d93a898a79d31f26a6d884a8feb7384
--- /dev/null
+++ b/src/test/resources/generator.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <properties resource="jdbc.properties" />
+    <!--数据库驱动-->
+    <classPathEntry location="/root/IdeaProjects/dh_data_mng/src/main/resources/postgresql-42.2.18.jar"/>
+
+    <!--    MyBatis3Simple和MyBatis3的生成区别！！！！！-->
+    <context id="postgresqlContext" targetRuntime="MyBatis3Simple">
+
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <!-- 指定生成 Mapper 的继承模板 -->
+        <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
+            <property name="mappers" value="${generator.mappers}"/>
+        </plugin>
+
+
+        <!--注意context内的文件要按序放-->
+        <commentGenerator>
+            <property name="suppressDate" value="true"/>
+            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+        <!--数据库链接地址账号密码-->
+        <jdbcConnection driverClass="org.postgresql.Driver"
+                        connectionURL="jdbc:postgresql://192.168.1.60:5432/dhmanage"
+                        userId="postgres"
+                        password="123456">
+
+        </jdbcConnection>
+
+        <javaTypeResolver>
+            <!-- 是否使用bigDecimal， false可自动转化以下类型（Long, Integer, Short, etc.） -->
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <!--生成Model、pojo类存放位置-->
+        <javaModelGenerator targetPackage="${generator.javaModel-targetPackage}" targetProject="${generator.targetProject}">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+
+        <!--生成映射文件存放位置-->
+        <sqlMapGenerator targetPackage="${generator.sqlMap-targetPackage}" targetProject="src/main/resources">
+            <!--            <property name="enableSubPackages" value="true"/>-->
+        </sqlMapGenerator>
+
+        <!--生成Dao类存放位置-->
+        <javaClientGenerator type="XMLMAPPER" targetPackage="${generator.javaClient-targetPackage}" targetProject="${generator.targetProject}">
+            <!--            <property name="enableSubPackages" value="true"/>-->
+        </javaClientGenerator>
+
+        <!--生成对应表及类名-->
+        <table tableName="zip_file"></table>
+        <table schema="EstimateTask"  tableName="estimate_task"
+               enableSelectByPrimaryKey="true"
+               enableUpdateByPrimaryKey="true"
+               enableDeleteByPrimaryKey="true">
+            <columnOverride column="geom" property="geom" javaType="java.lang.String"
+                            typeHandler="com.cetc32.dh.common.utils.MyGeometryTypeHandler"/>
+        </table>
+
+    </context>
+</generatorConfiguration>
diff --git a/src/test/resources/generator_mysql.xml b/src/test/resources/generator_mysql.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8be6736b4ec9250f5c446f7722666ad21968a8e
--- /dev/null
+++ b/src/test/resources/generator_mysql.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+
+
+    <properties resource="jdbc.properties" />
+
+    <classPathEntry location="/root/IdeaProjects/dh_data_mng/src/main/resources/mysql-connector-java-8.0.21.jar"/>
+
+    <!-- MyBatis3Simple：不生成 Example相关类及方法 defaultModelType="flat" -->
+<!--    targetRuntime="MyBatis3Simple"-->
+    <context id="MysqlContext" targetRuntime="MyBatis3Simple" >
+
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <!-- 指定生成 Mapper 的继承模板 -->
+        <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
+
+            <property name="mappers" value="${generator.mappers}"/>
+        </plugin>
+
+
+
+        <!--注意context内的文件要按序放-->
+        <commentGenerator>
+
+            <property name="suppressDate" value="true"/>
+            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+
+
+        <!-- jdbc 连接配置 -->
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                        connectionURL="${spring.datasource.url}"
+                        userId="${spring.datasource.username}"
+                        password="${spring.datasource.password}">
+        </jdbcConnection>
+
+
+
+        <javaTypeResolver>
+
+            <!-- 是否使用bigDecimal， false可自动转化以下类型（Long, Integer, Short, etc.） -->
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <!-- 生成实体类的包名和位置 ，targetPackage指的是包名,targetProject值得是路径位置-->
+        <!-- 对于生成的pojo所在包,pojo其实就是domain Entity-->
+        <javaModelGenerator targetPackage="${generator.javaModel-targetPackage}" targetProject="${generator.targetProject}">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+
+        <!-- 对于生成的mapper.xml所在目录 -->
+
+        <sqlMapGenerator targetPackage="${generator.sqlMap-targetPackage}" targetProject="src/main/resources"/>
+
+        <!-- 配置mapper对应的java映射  也可以叫dao层 -->
+        <javaClientGenerator targetPackage="${generator.javaClient-targetPackage}" targetProject="${generator.targetProject}"
+                             type="XMLMAPPER"/>
+
+
+
+        <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
+        <table tableName="my_table"></table>
+        <table schema="EstimateTask"  tableName="estimate_task"
+               enableSelectByPrimaryKey="true"
+               enableUpdateByPrimaryKey="true"
+               enableDeleteByPrimaryKey="true">
+            <columnOverride column="geom" property="geom" javaType="java.lang.String"
+                            typeHandler="com.cetc32.dh.common.utils.MyGeometryTypeHandler"/>
+        </table>
+
+    </context>
+</generatorConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/jdbc.properties b/src/test/resources/jdbc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4c7436ca4b49eae0dd5b4246ecbed572eb3dfda4
--- /dev/null
+++ b/src/test/resources/jdbc.properties
@@ -0,0 +1,32 @@
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+##spring.datasource.driverClassName=com.mysql.jdbc.Driver
+#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+#spring.datasource.username=root
+#spring.datasource.password=123
+
+spring.datasource.url=jdbc:postgresql://192.168.1.60:5432/dhmanage
+spring.datasource.username=postgres
+spring.datasource.password=123456
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+#Mybatis扫描
+mybatis.mapper-locations=classpath*:com/**/mapper/**.xml
+
+# Generator
+generator.targetProject=src/main/java
+#mapper的父类
+generator.mappers=tk.mybatis.mapper.common.Mapper
+#pojo所在报名
+generator.javaModel-targetPackage=com.cetc32.dh.entity
+#mapper.xml位于resource文件夹下的哪个目录中
+generator.sqlMap-targetPackage=mapper
+#mapper包名
+generator.javaClient-targetPackage=com.cetc32.dh.mybatis
+
+#配置文件传输
+spring.servlet.multipart.enabled =true  
+spring.servlet.multipart.file-size-threshold =0
+#单个数据的大小
+spring.servlet.multipart.max-file-size = 50GB
+#总数据的大小
+spring.servlet.multipart.max-request-size=50GB
diff --git a/src/test/resources/mysql-connector-java-8.0.21.jar b/src/test/resources/mysql-connector-java-8.0.21.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/test/resources/postgresql-42.2.18.jar b/src/test/resources/postgresql-42.2.18.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391