diff --git a/.gitignore b/.gitignore
index 549e00a2a96fa9d7c5dbc9859664a78d980158c2..e329924dc9aa099fbf2ad5c0e773916e557a0f81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+/myLogs/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cb41107373027e955f7fb8cc332f45156b025d21..0266af0420e2ad8d7b962430308c8c026a88ab86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,14 +283,13 @@
         <version>1.6.0</version>
         </dependency>
 
+
         <dependency>
-          <groupId>org.yaml</groupId>
-          <artifactId>snakeyaml</artifactId>
-          <version>1.25</version>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
         </dependency>
 
 
-
     </dependencies>
 
     <!--<dependencyManagement>
diff --git a/src/main/java/com/cetc32/dh/beans/DhOflineData.java b/src/main/java/com/cetc32/dh/beans/DhOflineData.java
index 6df8d0a31dee49bf578389db95db5008d36aa44e..bff1afe3ed22ca8f1e70f5931e40811f8c4ce7bd 100644
--- a/src/main/java/com/cetc32/dh/beans/DhOflineData.java
+++ b/src/main/java/com/cetc32/dh/beans/DhOflineData.java
@@ -7,6 +7,8 @@
  ******************************************************************************/
 package com.cetc32.dh.beans;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.List;
 
 public class DhOflineData {
@@ -30,6 +32,9 @@ public class DhOflineData {
 
     public void setDirectoryName(String directoryName) {
         this.directoryName = directoryName;
+        if(StringUtils.isNotBlank(directoryName)){
+            name = directoryName.substring(directoryName.lastIndexOf("/"));
+        }
     }
 
     public String getFiles() {
@@ -57,8 +62,10 @@ public class DhOflineData {
     public String getVersionDescription() {
         return versionDescription;
     }
-
-    public void setVersionDescription(String versionDescripton) {
+    public void setFileSizes(long fileSizes){
+        this.filesize =fileSizes;
+    }
+    public void setVersionDescription(String versionDescription) {
         this.versionDescription = versionDescription;
     }
 }
diff --git a/src/main/java/com/cetc32/dh/beans/PackageTaskParams.java b/src/main/java/com/cetc32/dh/beans/PackageTaskParams.java
new file mode 100644
index 0000000000000000000000000000000000000000..5abd167c2d11dec1385fef3f56f24b3a68826c6c
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/beans/PackageTaskParams.java
@@ -0,0 +1,31 @@
+package com.cetc32.dh.beans;
+
+public class PackageTaskParams {
+    String menuId;
+    String area;
+    String areaNames;
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getAreaNames() {
+        return areaNames;
+    }
+
+    public void setAreaNames(String areaNames) {
+        this.areaNames = areaNames;
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java b/src/main/java/com/cetc32/dh/beans/ReqSubmit.java
index a31e954839ad6a8c5450b4cd0947365d9215e038..f31503e85f06fa2521acc0fe617220dac5e10685 100644
--- a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java
+++ b/src/main/java/com/cetc32/dh/beans/ReqSubmit.java
@@ -14,6 +14,7 @@ public class ReqSubmit {
     private String username;
     private Integer department;
     private String file;
+    private String demandClassify;
 
     public String getProject() {
         return project;
@@ -87,6 +88,14 @@ public class ReqSubmit {
         this.file = file;
     }
 
+    public String getDemandClassify() {
+        return demandClassify;
+    }
+
+    public void setDemandClassify(String demandClassify) {
+        this.demandClassify = demandClassify;
+    }
+
     @Override
     public String toString() {
         return "ReqSubmit{" +
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java
index 4c24b5a55dae5d3e54a817770c67bfb6e390ad21..ffafe83f3432d95af16a710b964689f75097645a 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java
@@ -9,6 +9,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.DataPlp;
 import com.cetc32.dh.entity.DataTrace;
 import com.cetc32.dh.service.DataFileService;
@@ -18,6 +19,7 @@ import com.cetc32.dh.service.DataTraceService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,10 +28,8 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Stream;
 
 /**
  * 数据管理公共接口
@@ -42,6 +42,10 @@ import java.util.Map;
 @RestController
 @RequestMapping("/rest/datamanage/common")
 public class DataCommonController {
+    @Value("${plpUrl}")
+    private String plpUrl;
+    @Value("${traceUrl}")
+    private String traceUrl;
     @Autowired
     private DataFileService dataFileService;
     @Autowired
@@ -169,30 +173,45 @@ public class DataCommonController {
     public ResponseResult approveRate(@RequestBody Map<String, Object> map) {
         List<Object> list = new ArrayList<Object>();
         List<Integer> menuIds = (List<Integer>) map.get("menuIds");
-        String status = (String) map.get("status");
-        if (status == null || status.contains("全部审批") || StringUtils.isBlank(status)) {
+        String status0 = (String) map.get("status");
+        final String status;
+        if (status0 == null || status0.contains("全部审批") || StringUtils.isBlank(status0)) {
             status = null;
+        }else{
+            status = status0;
         }
-        Integer num;
-        for (Integer menuId : menuIds) {
-            if (menuId == 35) {
+
+        List<DataMenu> allMenus =dataMenuService.selectAll();
+        //final Optional<DataMenu> plpMenu =null ,traceMenu =null;
+        Stream<DataMenu> statisMenus=null;
+        final Optional<DataMenu> plpMenu = allMenus.stream().filter(f-> plpUrl.equals(f.getHtmlUrl())).findFirst();
+        assert(plpMenu.isPresent());
+        final Optional<DataMenu> traceMenu = allMenus.stream().filter(f-> traceUrl.equals(f.getHtmlUrl())).findFirst();
+        assert(traceMenu.isPresent());
+        allMenus.stream().filter(f-> "statistic".equals(f.getTags())).limit(allMenus.size()).forEach(f-> {
+            Integer menuId= f.getId().intValue();
+
+
+            Integer num;
+        /*for (Integer menuId : menuIds) {*/
+            if ( menuId == (traceMenu.get().getId().intValue())) {
                 DataTrace dataTrace = new DataTrace();
                 dataTrace.setStatus(status);
                 dataTrace.setMenuId(menuId);
                 num = dataTraceService.countFilesByObj(dataTrace);
                 Map<String, Object> hashMap = new HashMap<String, Object>();
-                hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName());
+                hashMap.put("name", traceMenu.get().getMenuName());
                 hashMap.put("value", num);
                 list.add(hashMap);
 //                hashMap.put(dataMenuService.queryById(menuId.longValue()).getMenuName()+":未审批百分比", (float) un_approve / total);
 //                hashMap.put(dataMenuService.queryById(menuId.longValue()).getMenuName()+":已审批百分比", 1-(float) un_approve / total);
-            } else if (menuId == 34) {
+            } else if (menuId == plpMenu.get().getId().intValue()) {
                 DataPlp dataPlp = new DataPlp();
                 dataPlp.setStatus(status);
                 dataPlp.setMenuId(menuId);
                 num = dataPlpService.countFilesByObj(dataPlp);
                 Map<String, Object> hashMap = new HashMap<String, Object>();
-                hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName());
+                hashMap.put("name", plpMenu.get().getMenuName());
                 hashMap.put("value", num);
                 list.add(hashMap);
             } else {
@@ -201,12 +220,16 @@ public class DataCommonController {
                 dataFile.setMenuId(menuId);
                 num = dataFileService.countFilesByObj(dataFile);
                 Map<String, Object> hashMap = new HashMap<String, Object>();
-                hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName());
+                Optional<DataMenu> optDataMenu= allMenus.stream().filter(o-> menuId.intValue()== o.getId().intValue()).findFirst();
+                assert(optDataMenu.isPresent());
+                hashMap.put("name", optDataMenu.get().getMenuName());
                 hashMap.put("value", num);
                 list.add(hashMap);
             }
 
-        }
+        //}
+
+        });
         return ResponseResult.success(list);
     }
 
@@ -220,30 +243,39 @@ public class DataCommonController {
     @PostMapping(value = "/sevenDayAdd")
     public ResponseResult sevenDayAdd(@RequestBody Map<String, Object> map) {
         List<Object> list = new ArrayList<Object>();
-        List<Integer> menuIds = (List<Integer>) map.get("menuIds");
-        Integer add_num;
+        //List<Integer> menuIds = (List<Integer>) map.get("menuIds");
+
         LocalDateTime today_start = LocalDateTime.of(LocalDate.now().minusDays(7), LocalTime.now());//当天零点
         String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.now());//当天最晚点
         String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
-        for (Integer menuId : menuIds) {
-            if (menuId == 35) {
+        List<DataMenu> allMenus =dataMenuService.selectAll();
+        //final Optional<DataMenu> plpMenu =null ,traceMenu =null;
+        Stream<DataMenu> statisMenus=null;
+        final Optional<DataMenu> plpMenu = allMenus.stream().filter(f-> plpUrl.equals(f.getHtmlUrl())).findFirst();
+        assert(plpMenu.isPresent());
+        final Optional<DataMenu> traceMenu = allMenus.stream().filter(f-> traceUrl.equals(f.getHtmlUrl())).findFirst();
+        assert(traceMenu.isPresent());
+        allMenus.stream().filter(f-> "statistic".equals(f.getTags())).limit(allMenus.size()).forEach(f-> {
+            Integer menuId = f.getId().intValue();
+            Integer add_num;
+            if (menuId == (traceMenu.get().getId().intValue())) {
                 DataTrace dataTrace = new DataTrace();
                 dataTrace.setTd_start(td_start);
                 dataTrace.setTd_end(td_end);
                 add_num = dataTraceService.countFilesByObj(dataTrace);
                 Map<String, Object> hashmap = new HashMap<String, Object>();
-                hashmap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName());
+                hashmap.put("name", traceMenu.get().getMenuName());
                 hashmap.put("value", add_num);
                 list.add(hashmap);
-            } else if (menuId == 34) {
+            } else if (menuId == plpMenu.get().getId().intValue()) {
                 DataPlp dataPlp = new DataPlp();
                 dataPlp.setTd_start(td_start);
                 dataPlp.setTd_end(td_end);
                 add_num = dataPlpService.countFilesByObj(dataPlp);
                 Map<String, Object> hashmap = new HashMap<String, Object>();
-                hashmap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName());
+                hashmap.put("name",  plpMenu.get().getMenuName());
                 hashmap.put("value", add_num);
                 list.add(hashmap);
             } else {
@@ -258,7 +290,7 @@ public class DataCommonController {
                 list.add(hashmap);
             }
 
-        }
+        });
         return ResponseResult.success(list);
     }
 
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 6a31e710dd5fa9e6c96f4f5cda2fb3853cd842ef..f542df30e3cb98dc90029d3da313f0764fa3ad4b 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -427,8 +427,9 @@ public class DataFileController {
       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 null;
       }
+      file.renameTo(new File(upCachePath + File.separator + fileName));
     }
     return fileName;
   }
@@ -698,7 +699,7 @@ public class DataFileController {
    *
    * @return 压缩结果
    */
-  @LoginSkipped
+  //@LoginSkipped
   @GetMapping("/zipFiles")
   public ResponseResult zipFiles(String[] fileIds, String zipName) {
     String zip_result = null;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
index 7dc3df0912c6b2ea6206149361442bb0f0af705a..1f1e0b053df13d187c2afb9fefd2da7634d9f670 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
@@ -115,9 +115,9 @@ public class DemanSubmitController {
            }
            List<DemandSubmit> demandlist = new ArrayList<>();
            Long count = 0L;
-           if((vdemand.getName()!=null&&vdemand.getName().contains("%"))||(vdemand.getPeople()!=null&&vdemand.getPeople().contains("%"))){
+           /*if((vdemand.getName()!=null&&vdemand.getName().contains("%"))||(vdemand.getPeople()!=null&&vdemand.getPeople().contains("%"))){
             return new PageDataResult(count,demandlist,vdemand.getOffset());
-           }
+           }*/
            demandlist = demandSubmitService.queryFilesByObj(vdemand);
            count = demandSubmitService.countFilesByObj(vdemand);
            return new PageDataResult(count,demandlist,vdemand.getOffset());
diff --git a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
index 6936ed06a4b03d363ff3224392263aa527041132..8d93de83e8aef8c4e9385f2891f16f179afdd530 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
@@ -62,7 +62,7 @@ public class EstimateTaskController {
         if((StringUtils.isBlank(vEstimate.classify)||vEstimate.classify.equals("全部分类"))&&StringUtils.isBlank(vEstimate.name)&&StringUtils.isBlank(vEstimate.astatus)&&StringUtils.isBlank(vEstimate.creator)){
             List<EstimateTask> estimateTasks = estimateTaskService.findAll();
             Integer count = estimateTaskService.countEstimate();
-            return new PageDataResult(count,estimateTasks,page * results);
+            return new PageDataResult(count.intValue(),estimateTasks,page * results);
         }else if(StringUtils.isNotBlank(vEstimate.name)&&(vEstimate.name.contains("%"))){
             List<EstimateTask> demandlist = new ArrayList<>();
             return new PageDataResult(0,demandlist,0);
@@ -75,7 +75,7 @@ public class EstimateTaskController {
             }
             List<EstimateTask> estimateTasks = estimateTaskService.queryFilesByObj(vEstimate);
             Integer count = estimateTaskService.queryFilesByObj(vEstimate).size();
-            return new PageDataResult(count,estimateTasks,page * results);
+            return new PageDataResult(count.intValue(),estimateTasks,page * results);
         }
     }
 
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 532372281ebc8f46095fb55285551f705df52857..867834a2fc20ce41d52bad5bc3cc5eb058abf28b 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
@@ -37,7 +37,8 @@ import java.util.Map;
 public class OtherInterfaceController {
     @Value("${offlineDataMenuId}")
     Integer offLineDataMenuId;
-
+    @Value("${gainMenuId}")
+    Integer gainMenuId;
     @Autowired
     DataFileService dataFileService;
 
@@ -72,6 +73,8 @@ public class OtherInterfaceController {
         submit.setDemandName(req.getName());
         submit.setReporter(SecurityUserUtil.getUser().getUsername());
         submit.setDemandAttachment(null);
+        submit.setStatus("未审批");
+        submit.setDemandClassify(req.getDemandClassify());
         Date create = new Date();
         submit.setCreattime(create);
         if(null != files){
@@ -249,6 +252,9 @@ public class OtherInterfaceController {
     @ApiOperation(value = "成果数据上报")
     @PostMapping("/import/gain")
     public ResponseData DataGain(@RequestBody DataFile dataFile) {
+        dataFile.setMenuId(gainMenuId);
+        dataFile.setStatus("未审批");
+        dataFile.setCreateTime(new Date());
         if(dataFileService.insertGain(dataFile)>0)
         {
             return ResponseData.success();
@@ -380,19 +386,19 @@ public class OtherInterfaceController {
 
     private boolean verifyEnventType( DataPlpCollect data) {
         String p=data.getPoints();
-        if(null == p){
+        if(null == p || StringUtils.isBlank(p)){
             return true;
         }
-        p= p.toUpperCase();
-        if(p.startsWith("POINT"))
+        p= p.toUpperCase().trim();
+        if(p.startsWith("POINT") || p.equals("8"))
         {
             data.setEventType("8");
         }
-        if(p.startsWith("LINESTRING"))
+        if(p.startsWith("LINESTRING")|| p.equals("64"))
         {
             data.setEventType("64");;
         }
-        if(p.startsWith("POLYGON"))
+        if(p.startsWith("POLYGON")|| p.equals("128"))
         {
             data.setEventType("128");
         }
@@ -401,7 +407,7 @@ public class OtherInterfaceController {
 
     @ApiOperation(value = "离线数据上报")
     @PostMapping("/import/offlinedata")
-    public ResponseData offlineData(@RequestBody DhOflineData data) {
+    public ResponseData offlineData(@RequestBody DataFile data) {
         if(null != data){
             if(null == data.getDirectoryName()
                     || null == data.getName()
@@ -411,7 +417,8 @@ public class OtherInterfaceController {
             DataFile df =new DataFile();
             df.setStatus("未审批");
             df.setMenuId(offLineDataMenuId);
-            df.setSubmitor(SecurityUserUtil.getUser().getUsername());
+            if(null != SecurityUserUtil.getUser())
+                df.setSubmitor(SecurityUserUtil.getUser().getUsername());
             df.setFilePath(data.getDirectoryName());
             df.setFileDiscription(data.getVersionDescription());
             df.setRegion(data.getName());
diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java
new file mode 100644
index 0000000000000000000000000000000000000000..c41534d18738c8f18e25143aa74f7c2610c0c4f3
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java
@@ -0,0 +1,267 @@
+package com.cetc32.dh.controller.rest;
+
+import com.cetc32.dh.beans.PackageTaskParams;
+import com.cetc32.dh.common.response.ResponseData;
+import com.cetc32.dh.common.response.ResponseResult;
+import com.cetc32.dh.entity.CityGeom;
+import com.cetc32.dh.entity.DataFile;
+import com.cetc32.dh.entity.DataMenu;
+import com.cetc32.dh.entity.DataPlp;
+import com.cetc32.dh.service.CityGeomService;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.DataMenuService;
+import com.cetc32.dh.service.DataPlpService;
+import com.cetc32.webutil.common.annotations.LoginSkipped;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/rest/prod/task/")
+public class ProductionTaskController {
+
+    CityGeomService cityGeomService;
+    DataFileService dataFileService;
+    DataPlpService dataPlpService;
+    DataMenuService dataMenuService;
+    @Value("${plpUrl}")
+    String plpUrl;
+
+    @Autowired
+    public void setCityGeomService(CityGeomService cityGeomService) {
+        this.cityGeomService = cityGeomService;
+    }
+
+    @Autowired
+    public void setDataFileService(DataFileService dataFileService) {
+        this.dataFileService = dataFileService;
+    }
+
+    @Autowired
+    public void setDataPlpService(DataPlpService dataPlpService) {
+        this.dataPlpService = dataPlpService;
+    }
+
+    @Autowired
+    public void setDataMenuService(DataMenuService dataMenuService) {
+        this.dataMenuService = dataMenuService;
+    }
+    /**
+     * 根据封装parmas检索提取对应区域数据，menuId为多个存在两种情况，
+     * 一种是完整的区域名称的方式回去对应信息，可能多个areaNames流程为；
+     *      1、先根据areaNames获取对应的完整的国省市三级名称
+     *      2、根据areaNames 获取对应Polygon信息
+     *      3、获取对应MenuId下包含的当前区域的所有数据路径
+     * 一种是基于params中的area信息检索对应的区域信息，可能多个Polygon，
+     *      1、基于polygon获取对应国家省市三级名称
+     *      2、获取包含该Polygon的对应MenuId下的数据
+     * **/
+    @PostMapping("/package")
+    @LoginSkipped
+    public ResponseData packageTaskParams(@RequestBody PackageTaskParams params){
+
+        if(null == params)
+            return ResponseData.error("无效的参数！");
+        if(StringUtils.isBlank(params.getMenuId()))
+            return ResponseData.error("缺少必要的数据分类");
+        if(StringUtils.isBlank(params.getAreaNames())
+                && StringUtils.isBlank(params.getArea()))
+            return ResponseData.error("区域名称和区域点集至少有一个不能为空");
+        Map<String,Object> results= new HashMap<>();
+        if(StringUtils.isNotBlank(params.getAreaNames())
+                && (StringUtils.isBlank(params.getArea())
+                    || !params.getArea().trim().toUpperCase().startsWith("POLYGON"))){
+            ResponseData msg =filterTaskInfoByNames(params, results);
+            if(null != msg)
+                return msg;
+        }else if(params.getArea().trim().toUpperCase().startsWith("POLYGON")){
+            String[] Polygons= params.getArea().split(";");
+            String newName= "";
+            for(String polygon:Polygons){
+                List<CityGeom>cgs = cityGeomService.selectCityInPolygon(polygon);
+                if(cgs.size()>0){
+                    CityGeom cityGeom=null;
+                    String name=cgs.get(0).getCity();
+                    int count =0;
+                    /**拼接国省市信息***/
+                    while( (cityGeom=cityGeomService.queryByName(name)) != null){
+                        count++;
+                        if(StringUtils.isNotBlank(cityGeom.getCity())) {
+                            newName  = cityGeom.getCity()  + ',' +newName;
+                        }else{
+                            break;
+                        }
+                        if(StringUtils.isNotBlank(cityGeom.getProvince())){
+                            name =cityGeom.getProvince();
+                        }else {
+                            break;
+                        }
+                        if(count>10)/**防止部分数据异常陷入死循环*/
+                            break;
+                    }
+                    newName = shortPackNames(newName);
+                    if(null !=newName){
+                        results.put("city",newName+";");
+                    }else{
+                        return ResponseData.error(polygon + "无法找到Polygon对应国家省市信息");
+                    }
+                }
+            }
+            if(StringUtils.isBlank(newName))
+                return ResponseData.error(params.getArea()+"未检索到区域层级名称！");
+            results.put("city",newName+";");
+            Set<String> filePaths = new HashSet<>();
+            String[] menuIds = params.getMenuId().split(",");
+            String id = getPlpMenuId();
+            for(String menuId:menuIds){;
+                if(menuId.equals(id)){//dataPlpService
+                    try{
+                        packagePlpFileByPolygons(filePaths, Polygons);
+                    }catch (Exception e){
+                        return ResponseData.error(e.getMessage());
+                    }
+                }else{
+                    DataFile dataFile =new DataFile();
+                    dataFile.setMenuId(Integer.valueOf(menuId));
+                    for(int i=0 ;i<Polygons.length;i++){
+                        dataFile.setPoints(Polygons[i]);
+                        try {
+                            List<DataFile> lists = dataFileService.queryFilesByObj(0, Integer.MAX_VALUE, dataFile);
+                            for(DataFile df :lists){
+                                filePaths.add(df.getFilePath());
+                            }
+                        }catch (Exception e){
+                            return ResponseData.error(e.getMessage());
+                        }
+
+                    }
+                }
+            }
+            results.put("area",params.getArea());
+
+            if(filePaths==null || filePaths.size() ==0)
+                return ResponseData.error("未检索到指定区域可用数据！");
+            results.put("path",filePaths);
+        }else{
+            return ResponseData.error("提供区域名称或者区域点集合无法");
+        }
+        return ResponseData.success(results);
+    }
+
+    @NotNull
+    private String getPlpMenuId() {
+        List<DataMenu> menus = dataMenuService.selectAll();
+
+        Optional<DataMenu> menu = menus.stream().filter(f->plpUrl.equals(f.getHtmlUrl())).findFirst();
+        assert(menu.isPresent());
+        String id = menu.get().getId()+"";
+        return id;
+    }
+
+    /********************************************************
+     *      1、先根据areaNames获取对应的完整的国省市三级名称
+     *      2、根据areaNames 获取对应Polygon信息
+     *      3、获取对应MenuId下包含的当前区域的所有数据路径
+     * @param params  过滤数据需要的参数包括menuId，areaNames，areaq区域点集合
+     * @param results 需要把结果封装成的数据供给后续使用
+     * @return 正常情况下返回值为空，数据异常时候回返回ResponseData
+     ************************************************************/
+    private ResponseData filterTaskInfoByNames(PackageTaskParams params, Map<String, Object> results) {
+        String[] names = params.getAreaNames().split(",");
+        String name="",newName="",polygons="",errors="";
+        StringBuffer cityies = new StringBuffer();
+        CityGeom cityGeom;int count=0;
+        for (int i = 0; i < names.length; i++) {
+            name = names[i];
+            newName = "";
+            count=0;
+            /**拼接国省市信息***/
+            while( (cityGeom=cityGeomService.queryByName(name)) != null){
+                count++;
+                if(StringUtils.isNotBlank(cityGeom.getCity())) {
+                    newName =  cityGeom.getCity()+","+newName;
+                    if(names[i].trim().equals(cityGeom.getCity().trim())){/** 及时提取区域信息 */
+                        polygons +=  cityGeom.getPolygonText().trim()+";";
+                        polygons.replace(";;",";");
+                    }
+                }else{
+                    break;
+                }
+                if(StringUtils.isNotBlank(cityGeom.getProvince())){
+                    name =cityGeom.getProvince();
+                }else {
+                    break;
+                }
+                if(count>10)/**防止部分数据异常陷入死循环*/
+                    break;
+            }
+            newName = shortPackNames(newName);
+            if(null !=newName){
+                cityies.append(newName);
+                cityies.append(";");
+            }else{
+                errors += name +" ";
+            }
+        }
+        Set<String> filePaths = new HashSet<>();
+        String[] menuIds = params.getMenuId().split(",");
+        String id =getPlpMenuId();
+        for(String menuId:menuIds){;
+            if(menuId.equals(id)){//dataPlpService
+                packagePlpFileByPolygons(filePaths, polygons.split(";"));
+                continue;
+            }else{
+                DataFile dataFile =new DataFile();
+                dataFile.setMenuId(Integer.valueOf(menuId));
+                for(int i=0 ;i<names.length;i++){
+                    dataFile.setRegion(names[i]);
+                    List<DataFile> lists = dataFileService.queryFilesByObj(0,Integer.MAX_VALUE,dataFile);
+                    for(DataFile df :lists){
+                        filePaths.add(df.getFilePath());
+                    }
+                }
+            }
+        }
+        if(StringUtils.isNotBlank(errors)){
+            return ResponseData.error("["+errors+"]未匹配到对应城市信息");
+        }
+        if(StringUtils.isBlank(cityies))
+            return ResponseData.error(params.getAreaNames()+"未检索到区域层级名称！");
+        results.put("city",cityies.toString());
+        if(StringUtils.isBlank(polygons))
+            return ResponseData.error(params.getAreaNames()+"未检索到区域点集合！");
+        results.put("area",polygons);
+        if(filePaths==null || filePaths.size() ==0)
+            return ResponseData.error("未检索到指定区域可用数据！");
+        results.put("path",filePaths);
+        return null;
+    }
+
+    private String shortPackNames(String newName) {
+        while (null != newName && newName.trim().endsWith(",")) {
+            try {
+                newName = newName.trim().substring(0,newName.trim().length()-1);
+            } catch (StringIndexOutOfBoundsException e) {
+                newName = null;
+            }
+        }
+        return newName;
+    }
+
+    private void packagePlpFileByPolygons(Set<String> filePaths, String[] split) {
+        Set<DataPlp> plps = cityGeomService.menuAndPgonPlm(Arrays.asList(split));
+        if (null == plps || plps.size() == 0)
+            return;
+        Iterator<DataPlp> it = plps.iterator();
+        while (it.hasNext()) {
+            filePaths.add(it.next().getFileName());
+        }
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java
index 741ee8034f7d0797868484285ce3ceb2ccc7513e..66e01b369bc4a32728488305eeb46e35f01acf84 100644
--- a/src/main/java/com/cetc32/dh/entity/DataFile.java
+++ b/src/main/java/com/cetc32/dh/entity/DataFile.java
@@ -225,6 +225,9 @@ public class DataFile extends NumberS {
     @Column(name= "ref_codenum")
     private String refCodenum;
 
+    @Column(name = "points")
+    private String points;
+
     /**
      * 无参构造函数
      */
@@ -358,6 +361,14 @@ public class DataFile extends NumberS {
         this.area = area == null ? null : area.trim();
     }
 
+    public String getPoints() {
+        return points;
+    }
+
+    public void setPoints(String points) {
+        this.points = points;
+    }
+
     /**
      * 获取数据安全等级，文件(夹)安全等级
      *
@@ -385,6 +396,10 @@ public class DataFile extends NumberS {
         return filePath;
     }
 
+    public String getDirectoryName(){
+        return getFilePath();
+    }
+
     /**
      * 设置数据路径，文件(夹)存放路径
      *
@@ -394,6 +409,10 @@ public class DataFile extends NumberS {
         this.filePath = filePath == null ? null : filePath.trim();
     }
 
+    public void setDirectoryName(String directoryName){
+        setFilePath(directoryName);
+    }
+
     /**
      * 获取数据时间，文件(夹)创建时间
      *
@@ -466,6 +485,13 @@ public class DataFile extends NumberS {
         this.region = region == null ? null : region.trim();
     }
 
+    public void setName(String name){
+        setRegion(name);
+    }
+    public String getName(){
+        return getRegion();
+    }
+
     /**
      * 获取数据大小，文件(夹)大小
      *
@@ -510,7 +536,9 @@ public class DataFile extends NumberS {
     public String getFileDiscription() {
         return fileDiscription;
     }
-
+    public String getVersionDescription(){
+        return getFileDiscription();
+    }
     /**
      * 设置数据描述，文件(夹)描述
      *
@@ -520,6 +548,10 @@ public class DataFile extends NumberS {
         this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
     }
 
+    public void setVersionDescription(String versionDescription){
+        setFileDiscription(versionDescription);
+    }
+
     /**
      * 获取提交人
      *
diff --git a/src/main/java/com/cetc32/dh/entity/DataMenu.java b/src/main/java/com/cetc32/dh/entity/DataMenu.java
index a0222c0250dd5e6ac6e30f877dbc9e132164aee9..4f6c35300482d3484cfabda1ddcd8d796f7b00fd 100644
--- a/src/main/java/com/cetc32/dh/entity/DataMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/DataMenu.java
@@ -73,6 +73,16 @@ public class DataMenu implements Serializable {
      */
     private Boolean addkids;
 
+    @Column(name = "tags")
+    private String tags;
+
+    public String getTags() {
+        return tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
 
     /**
      * 无参构造函数
diff --git a/src/main/java/com/cetc32/dh/entity/DataPlp.java b/src/main/java/com/cetc32/dh/entity/DataPlp.java
index 31e619dc446155d174e4cb1712127ff1fcdcfbb3..133b78263e6bb866840028fac672e4b5f4e9aa22 100644
--- a/src/main/java/com/cetc32/dh/entity/DataPlp.java
+++ b/src/main/java/com/cetc32/dh/entity/DataPlp.java
@@ -6,6 +6,8 @@
  ******************************************************************************/
 package com.cetc32.dh.entity;
 
+import org.apache.commons.lang3.StringUtils;
+
 import javax.persistence.Column;
 import javax.persistence.Table;
 import java.util.Date;
@@ -391,7 +393,25 @@ public class DataPlp extends NumberS {
    * @param eventType 数据类型-8:点，线：64,面：128
    */
   public void setEventType(String eventType) {
-    this.eventType = eventType == null ? null : eventType.trim();
+    if(null == eventType || StringUtils.isBlank(eventType)){
+      return ;
+    }
+    eventType= eventType.toUpperCase().trim();
+    if(eventType.startsWith("POINT") || eventType.equals("8"))
+    {
+      eventType ="8";
+    }
+    else if(eventType.startsWith("LINESTRING")|| eventType.equals("64"))
+    {
+      eventType ="64";
+    }
+    else if(eventType.startsWith("POLYGON")|| eventType.equals("128"))
+    {
+      eventType ="128";
+    }else {
+      eventType = null;
+    }
+    this.eventType = eventType;
   }
 
   /**
diff --git a/src/main/java/com/cetc32/dh/entity/EstimateTask.java b/src/main/java/com/cetc32/dh/entity/EstimateTask.java
index 4e28b97845d496581dd55d220bb0b1af6c582418..440f88c829ee6ef9afe8e75010686112dadb9f21 100644
--- a/src/main/java/com/cetc32/dh/entity/EstimateTask.java
+++ b/src/main/java/com/cetc32/dh/entity/EstimateTask.java
@@ -1,5 +1,8 @@
 package com.cetc32.dh.entity;
 
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.Date;
 import java.util.List;
 
@@ -44,6 +47,8 @@ public class EstimateTask extends NumberS{
     private String taskdes;
 
     private Date changetime;
+    private JSONObject data;
+    private String datas;
 
     public String getReason() {
         return reason;
@@ -203,6 +208,7 @@ public class EstimateTask extends NumberS{
 
     public void setTaskdes(String taskdes) {
         this.taskdes = taskdes;
+        this.setContent(taskdes);
     }
 
     public Date getChanggetime() {
@@ -212,4 +218,61 @@ public class EstimateTask extends NumberS{
     public void setChanggetime(Date changgetime) {
         this.changetime = changgetime;
     }
+
+    public String getDatas() {
+        if(null == data)
+            return null;
+        return data.toJSONString();
+    }
+    public JSONObject getData(){
+        return data;
+    }
+
+    public void setData(JSONObject data) {
+        this.data = data;
+    }
+
+    public void setDatas(String datas) {
+        this.datas = datas;
+        try{
+            if(null == data)
+                data = JSONObject.parseObject(datas);
+            else
+                data.putAll(JSONObject.parseObject(datas));
+        }catch (JSONException e){
+
+        }
+    }
+    private void setValue(String key ,String value){
+        if(null ==data){
+            data = new JSONObject();
+        }
+        data.put(key,value);
+    }
+    public void setContent(String content){
+        setValue("content",content);
+    }
+    public void setUrl(String url){
+        setValue("url",url);
+    }
+    public void setHttpmethod(String httpmethod){
+        setValue("httpmethod",httpmethod);
+    }
+    public void setParameters(String parameters){
+        setValue("parameters",parameters);
+    }
+    public void setExpectedResult(String expectedResult){
+        setValue("expectedResult",expectedResult);
+    }
+
+    private String getValue(String key){
+        if(null ==data || key==null)
+            return null;
+        try{
+            return data.getString(key);
+        }catch(JSONException e){
+            return null;
+        }
+    }
+
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
index fdb1c09dd781189112a6a8a8a610e9a38cbf672f..1c824c2137cdf2136e6b5c8936b9f5b7abca63d7 100644
--- a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
@@ -26,6 +26,8 @@ public interface CityGeomMapper extends Mapper<CityGeom> {
 
     public CityGeom queryByName(String name);
 
+    public List<CityGeom> selectCityInPolygon(@Param("polygon")String polygon);
+
   /**
    * 判断多边形polygon2是否在多边形polygon1中
    *
diff --git a/src/main/java/com/cetc32/dh/service/CityGeomService.java b/src/main/java/com/cetc32/dh/service/CityGeomService.java
index 742879d733113c5e55cecb563c58ad6a744e341f..a5b9ae389f34b631f1e27ade233a03fe857f6622 100644
--- a/src/main/java/com/cetc32/dh/service/CityGeomService.java
+++ b/src/main/java/com/cetc32/dh/service/CityGeomService.java
@@ -21,7 +21,7 @@ public interface CityGeomService {
     List<TreeData> selectTreeData(String proCode);
     String selectCityInCodes(  List<String> areaCodes);
     List<String> selectCodesInArea(List<String> cities);
-
+   List<CityGeom> selectCityInPolygon(String polygon);
 
   public int updateByName(CityGeom cityGeom);
 
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 d3d7f9288360fb0088786f543ff24a11e8812749..7436e7bd38e41dd4cede0d58473ab44568723187 100644
--- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java
@@ -95,20 +95,20 @@ public class CityGeomServiceImpl implements CityGeomService {
   @Override
   public Map<String,String> areaToPolygon(List<String> areaNames){
     Map<String, String> areaPlg = new HashMap<>();
-    ProvinceGeom provinceGeom;
+    //ProvinceGeom provinceGeom;
     CityGeom cityGeom;
     for (int i = 0; i < areaNames.size(); i++) {
-      provinceGeom = provinceGeomService.queryByName(areaNames.get(i));
+      /*provinceGeom = cityGeom.queryByName(areaNames.get(i));
       if (provinceGeom != null) {
         areaPlg.put(areaNames.get(i), provinceGeom.getPolygonText());
-      } else {
+      } else {*/
         cityGeom = cityGeomMapper.queryByName(areaNames.get(i));
         if (cityGeom != null) {
           areaPlg.put(areaNames.get(i), cityGeom.getPolygonText());
         }else{
           areaPlg.put(null, areaNames.get(i));
         }
-      }
+      //}
     }
     return areaPlg;
   }
@@ -152,6 +152,10 @@ public class CityGeomServiceImpl implements CityGeomService {
     return resultFileList;
   }
 
+  @Override
+  public List<CityGeom> selectCityInPolygon(String polygon) {
+    return cityGeomMapper.selectCityInPolygon(polygon);
+  }
 
   @Override
   public Set<DataPlp> menuAndPgonPlm(List<String> polygons) {
@@ -159,7 +163,9 @@ public class CityGeomServiceImpl implements CityGeomService {
     String area;
     Set<DataPlp> resultFileList = new HashSet<>();
     List<DataPlp> dataPlpList = new ArrayList<>();
-    dataPlpList = dataPlpService.selectAll();
+    DataPlp dataplp = new DataPlp();
+    dataplp.setEventType("POLYGON");
+    dataPlpList = dataPlpService.queryFilesByObj(0,Integer.MAX_VALUE,dataplp);
     for (int i = 0; i < dataPlpList.size(); i++) {
       area = dataPlpList.get(i).getPoints();
       if (area!=null&&area.toLowerCase().contains("polygon")) {
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java
index a1da47edc909b2fd7865dda028044eb385426a0e..c89f77e81d1e66fe0cb84200ef0cacee5491368e 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java
@@ -22,6 +22,8 @@ public class DataAreaServiceImpl implements DataAreaService {
 
     @Override
     public Integer insertArea(List<DataArea> areaList) {
+        if(areaList==null || areaList.size()==0)
+            return 0;
         return dataAreaMapper.insertArea(areaList);
     }
 
@@ -33,7 +35,8 @@ public class DataAreaServiceImpl implements DataAreaService {
     @Override
     public Integer updateArea(Long dataId, List<DataArea> list) {
         dataAreaMapper.deleteAreaByDataId(dataId);
-        dataAreaMapper.insertArea(list);
-        return null;
+        if(null == list || list.size() == 0)
+            return 0;
+        return dataAreaMapper.insertArea(list);
     }
 }
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 8330686285d51ad60e80ee8cc44ecff277fb342e..96d138948c78853f18b5a28494093e657926153a 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java
@@ -84,12 +84,20 @@ public class DataFileServiceImpl implements DataFileService {
     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())));
+    if(dataFile.getRegionList()!=null){
+      for(String s:dataFile.getRegionList()){
+        dataAreas .add(new DataArea(Long.valueOf(dataFile.getId()),
+                s,
+                Long.valueOf(dataFile.getMenuId())));
+      }
+      if(dataAreas.size()>0){
+        try{
+          dataAreaMapper.insertArea(dataAreas);
+        }catch (Exception e){
+          e.printStackTrace();
+        }
+      }
     }
-    dataAreaMapper.insertArea(dataAreas);
     return id;
   }
   /************************************************************************
@@ -296,8 +304,15 @@ public class DataFileServiceImpl implements DataFileService {
       if (dataFile.getRegion().contains("%")) {
         return new ArrayList<>();
       } else if (StringUtils.isNotBlank(dataFile.getRegion())) {
-        String fileRegion = "%" + dataFile.getRegion() + "%";
-        dataFile.setRegion(fileRegion);
+
+        String polygon = dataFile.getRegion().toUpperCase().trim();
+        if(polygon.startsWith("POLYGON")){
+          dataFile.setPoints(polygon);
+          dataFile.setRegion(null);
+        }else{
+          String fileRegion = "%" + dataFile.getRegion() + "%";
+          dataFile.setRegion(fileRegion);
+        }
       } else {
         dataFile.setRegion(null);
       }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a840b53bf34500cd96b5fee360210c65a5fb2051..0e583a30ed4f8688f1f35f1307e9d3ba4f16b1f6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -77,6 +77,7 @@ flowPath: ${rootPath}/flowpath/
 upDatePath: ${rootPath}/updatePath/
 downPath: ${rootPath}/downPath
 eip: http://192.168.1.42:8080/
+gainMenuId: 10
 sso:
   authcenter: http://192.168.1.42:8087
   verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index 784527fecc8c0f49945bf28d2765d6dde1edb7ef..79ef29ec9d94e08ae7c5728af04734a965ccd2ba 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -25,9 +25,11 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    url: jdbc:postgresql://180.184.65.203:5432/dhmanage
     username: postgres
-    password: 123456
+    #password: 123456
+    password: Zdk@824.
     driver-class-name: org.postgresql.Driver
 
 #  datasource:
@@ -75,8 +77,10 @@ flowPath: ${rootPath}/flowpath/
 upDatePath: ${rootPath}/updatePath/
 downPath: ${rootPath}/downPath
 eip: http://192.168.1.206:8080/
+gainMenuId: 10
 sso:
-  authcenter: http://192.168.1.206:8081
+  ##authcenter: http://192.168.1.206:8081
+  authcenter: http://180.184.65.203:8087
   verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
   passportUrl: ${sso.authcenter}/?ReturnUrl=
   defaultLoginRequiredEnable: true
diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml
new file mode 100644
index 0000000000000000000000000000000000000000..720e9544d400feb42484db7fc6be72e479a2cf86
--- /dev/null
+++ b/src/main/resources/application-xwybjb.yml
@@ -0,0 +1,95 @@
+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://180.184.65.203:5432/dhmanage
+    url: jdbc:postgresql://localhost:5432/dhmanage
+    username: postgres
+    password: 123456
+    #password: Zdk@824.
+    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
+  #authcenter: http://180.184.65.203:8087
+  authcenter: http://localhost: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
+gainMenuId: 21
+plpUrl: /plpData
+traceUrl: /traceData
diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml
index ebb2d76605a1ed5a56ea64c402147fb97e643a59..cb0810e0e81389937451dc36176fa13fe31e7a31 100644
--- a/src/main/resources/mapper/CityGeomMapper.xml
+++ b/src/main/resources/mapper/CityGeomMapper.xml
@@ -10,7 +10,7 @@
         <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
+        select city ,city_code,province,province_code, from city_geom
         <where >
             <if test="proCode !=null and proCode !=''">
                 province_code =#{proCode}
@@ -35,9 +35,9 @@
         where city = #{city,jdbcType=VARCHAR}
     </update>
 
-    <select id="queryByName" parameterType="java.lang.String" resultType="com.cetc32.dh.entity.CityGeom">
+    <select id="queryByName" parameterType="java.lang.String" resultMap="BaseResultMap" >
         select * from city_geom
-        where city = #{name ,jdbcType=VARCHAR}
+        where city = #{name ,jdbcType=VARCHAR} limit 1
     </select>
     <select id="selectCityInCodes"  resultType="java.lang.String">
         select array_to_string (
@@ -63,4 +63,8 @@
     <select id="judgePointContain" resultType="java.lang.Boolean" parameterType="java.lang.String">
         select ST_Contains( ST_GeomFromText (#{polygon},4326), ST_GeomFromText (#{point},4326));
     </select>
+    <select id="selectCityInPolygon"  resultMap="BaseResultMap" parameterType="java.lang.String">
+        select * from city_geom where ST_Contains( ST_GeomFromText (polygon_text,4326), ST_GeomFromText (#{polygon},4326))
+        order by city_code desc;
+    </select>
 </mapper>
diff --git a/src/main/resources/mapper/DataAreaMapper.xml b/src/main/resources/mapper/DataAreaMapper.xml
index 3eeb846a27cbf3f007d161b6ed64988a4d80170b..0d19d5698dfc03698faae113aa2d07c746ce8a97 100644
--- a/src/main/resources/mapper/DataAreaMapper.xml
+++ b/src/main/resources/mapper/DataAreaMapper.xml
@@ -7,6 +7,7 @@
         <result column="menuid" property="menuId" jdbcType="INTEGER" />
     </resultMap>
     <insert id="insertArea"  parameterType="com.cetc32.dh.entity.DataArea">
+--         select count(*) from data_area;
         insert into data_area(dataid,citycode,menuid)
         values
         <foreach collection="list" item="area" separator=",">
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index 7443c337d1d6a1db5416f9828276cb88ec732b5b..45217fdf7cc45ab5d9518a6b424344a06f772c8c 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -126,7 +126,9 @@
       <if test="area!= null">
         area
       </if>
-
+      <if test="points!= null">
+        points
+      </if>
       <if test="imgExample!= null">
         img_example,
       </if>
@@ -234,7 +236,9 @@
       <if test="area!= null">
         #{area,jdbcType=VARCHAR},
       </if>
-
+      <if test="points!= null">
+        #{points}
+      </if>
       <if test="imgExample!= null">
         #{imgExample,jdbcType=VARCHAR},
       </if>
@@ -316,6 +320,9 @@
         area,
       </if>
 
+      <if test="points!= null">
+        points
+      </if>
     </trim>
 
 
@@ -367,6 +374,9 @@
         #{area,jdbcType=VARCHAR},
       </if>
 
+      <if test="points!= null">
+        #{points}
+      </if>
 
     </trim>
     /*returning id*/
@@ -716,7 +726,17 @@
       <if test="dataFile.td_start != null and dataFile.td_start != ''">
         and create_time &gt;= #{dataFile.td_start}::timestamp
       </if>
-
+      <if test="dataFile.points != null">
+        and (
+        ( points is not null and ST_Contains(ST_GeomFromText( points,4326),ST_GeomFromText(#{dataFile.points},4326)))
+        or
+        (points is null and
+         id in (select distinct (dataid) from data_area where menuid = #{dataFile.menuId} and
+           citycode in( select city_code from city_geom where ST_Contains(ST_GeomFromText(polygon_text,4326),ST_GeomFromText(#{dataFile.points},4326)))
+         )
+        )
+        )
+      </if>
     </where>
 
     order by id desc
@@ -776,6 +796,17 @@
       <if test="dataFile.td_start != null and dataFile.td_start != ''">
         and create_time &gt;= #{dataFile.td_start}::timestamp
       </if>
+      <if test="dataFile.points != null">
+        and (
+        ( points is not null and ST_Contains(ST_GeomFromText( points,4326),ST_GeomFromText(#{dataFile.points},4326)))
+        or
+        (points is null and
+        id in (select distinct (dataid) from data_area where menuid = #{dataFile.menuId} and
+        citycode in( select city_code from city_geom where ST_Contains(ST_GeomFromText(polygon_text,4326),ST_GeomFromText(#{dataFile.points},4326)))
+        )
+        )
+        )
+      </if>
     </where>
   </select>
 
diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml
index c6adc27443efbba9d8985327eb8ee450a384c9c1..65eae420ee804ac40ea09563dfc1bd687e2e60e3 100644
--- a/src/main/resources/mapper/DataMenuMapper.xml
+++ b/src/main/resources/mapper/DataMenuMapper.xml
@@ -15,6 +15,7 @@
     <result column="icon" jdbcType="VARCHAR" property="icon" />
     <result column="key" jdbcType="VARCHAR" property="key" />
     <result column="addkids" jdbcType="BIT" property="addkids" />
+    <result column="tags" jdbcType="VARCHAR" property="tags" />
 
   </resultMap>
 
diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml
index fa905fb318e30ea1003f75f33369e3440e970ce7..b89bc29d2cb35a5e683b5aa467eba53985358530 100644
--- a/src/main/resources/mapper/EstimateTaskMapper.xml
+++ b/src/main/resources/mapper/EstimateTaskMapper.xml
@@ -19,10 +19,11 @@
     <result column="reason" jdbcType="VARCHAR" property="reason"/>
     <result column="taskdes" jdbcType="VARCHAR" property="taskdes"/>
     <result column="changetime" jdbcType="TIMESTAMP" property="changetime" />
+    <result column="datas" jdbcType="VARCHAR" property="datas" />
   </resultMap>
   <sql id="Base_Column_List">
     id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime,
-    status,approver,demandid,approvtime,report,reason,taskdes,changetime
+    status,approver,demandid,approvtime,report,reason,taskdes,changetime,datas
   </sql>
 
   <select id="findAll" resultMap="BaseResultMap">
@@ -58,11 +59,12 @@
     insert into estimate_task (id, name, task_classify,
       task_type, task_path, starttime,
       endtime, creator, creattime,
-      status,approver,demandid,approvtime)
+      status,approver,demandid,approvtime,datas)
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{taskClassify,jdbcType=VARCHAR},
       #{taskType,jdbcType=VARCHAR}, #{taskPath,jdbcType=VARCHAR}, #{starttime,jdbcType=TIMESTAMP},
       #{endtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{creattime,jdbcType=TIMESTAMP},
-      #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demandId,jdbcType=INTEGER},#{approvtime,jdbcType=TIMESTAMP})
+      #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demandId,jdbcType=INTEGER},#{approvtime,jdbcType=TIMESTAMP},
+      #{datas,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.cetc32.dh.entity.EstimateTask">
     insert into estimate_task
@@ -112,9 +114,12 @@
       <if test="taskdes != null">
         taskdes,
       </if>
-      <if test="changetime == null">
+      <if test="changetime != null">
         changetime,
       </if>
+      <if test="datas != null">
+        datas,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -162,9 +167,12 @@
       <if test="taskdes != null">
         #{taskdes,jdbcType=VARCHAR},
       </if>
-      <if test="changetime == null">
+      <if test="changetime != null">
         now(),
       </if>
+      <if test="datas != null">
+        #{datas},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.cetc32.dh.entity.EstimateTask">
@@ -216,6 +224,9 @@
       <if test="taskdes != null">
         taskdes=#{taskdes,jdbcType=VARCHAR},
       </if>
+      <if test="datas != null">
+        datas=#{datas,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
diff --git a/src/test/java/com/cetc32/DataAreaTest.java b/src/test/java/com/cetc32/DataAreaTest.java
index 01ad8e5362bb03a2fc66cc4a8e96b934fed2610c..1dd18f99233646e69ec9d4b557fe7417c4b95aed 100644
--- a/src/test/java/com/cetc32/DataAreaTest.java
+++ b/src/test/java/com/cetc32/DataAreaTest.java
@@ -10,9 +10,11 @@ package com.cetc32;
 
 import com.cetc32.dh.DhApplication;
 import com.cetc32.dh.common.bean.UserAreaPermision;
+import com.cetc32.dh.entity.DataArea;
 import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.ZQArea;
 import com.cetc32.dh.mybatis.CityGeomMapper;
+import com.cetc32.dh.mybatis.DataAreaMapper;
 import com.cetc32.dh.mybatis.DataFileMapper;
 import com.cetc32.dh.mybatis.ZqAreaMapper;
 import org.junit.Test;
@@ -30,14 +32,16 @@ import java.util.regex.Pattern;
 @SpringBootTest(classes = DhApplication.class ,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 //@WebAppConfiguration
 public class DataAreaTest {
-    @Autowired
+    //@Autowired
     CityGeomMapper cityGeomMapper;
-    @Autowired
+    //@Autowired
     ZqAreaMapper zqAreaMapper;
-    @Autowired
+    //@Autowired
     DataFileMapper dataFileMapper;
+    @Autowired
+    DataAreaMapper dataAreaMapper;
 
-    @Test
+    //@Test
     public void datafileList(){
         DataFile dataFile =new DataFile();
         UserAreaPermision user =new UserAreaPermision();
@@ -57,14 +61,21 @@ public class DataAreaTest {
         System.out.println(dataFileMapper.countFilesHasPermission(dataFile,user,user.getPolygon()));
     }
 
-    @Test
+    //@Test
     public void testZqArea(){
         List<String > ids =new ArrayList<>();
         ids .add("01");
         System.out.println("ZQAreas "+zqAreaMapper.selectAreaByZqId(ids));
     }
-
     @Test
+    public void insertArea(){
+        /*DataArea dataArea =new DataArea(100000L,"110000",99L);
+        List<DataArea > dataAreas =new ArrayList<>();
+        dataAreas.add(dataArea);
+        dataAreaMapper.insertArea(dataAreas);*/
+
+    }
+    //@Test
     public void TestSelectCityFromAreaCodes(){
         ArrayList<String> list =new ArrayList();
         list.add("110000");
@@ -73,7 +84,7 @@ public class DataAreaTest {
         System.out.println(cityGeomMapper.selectCityInCodes(list));
     }
 
-    @Test
+    //@Test
     public void TestSelectAeraCodeFromCities(){
         ArrayList<String> list =new ArrayList();
         list.add("驻马店市");
@@ -81,7 +92,7 @@ public class DataAreaTest {
         list.add("深圳市");
         System.out.println(cityGeomMapper.selectCodesInArea(list));
     }
-    @Test
+    //@Test
     public void zhengzebiaodashi(){
         System.out.println(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$","你1好"));
     }
diff --git a/src/test/resources/application-xwy.yml b/src/test/resources/application-xwy.yml
index d3e2051b13f9cd3cfb15803c4226596787b3dcbf..1d87a2bd7dd675dc8936759576b28226c6f0b423 100644
--- a/src/test/resources/application-xwy.yml
+++ b/src/test/resources/application-xwy.yml
@@ -25,9 +25,11 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    url: jdbc:postgresql://180.184.65.203:5432/dhmanage
     username: postgres
-    password: 123456
+    #password: 123456
+    password: Zdk@824.
     driver-class-name: org.postgresql.Driver
 
   #  datasource:
@@ -75,8 +77,10 @@ flowPath: ${rootPath}/flowpath/
 upDatePath: ${rootPath}/updatePath/
 downPath: ${rootPath}/downPath
 eip: http://192.168.1.206:8080/
+gainMenuId: 10
 sso:
-  authcenter: http://192.168.1.206:8081
+  ##authcenter: http://192.168.1.206:8081
+  authcenter: http://180.184.65.203:8087
   verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
   passportUrl: ${sso.authcenter}/?ReturnUrl=
   defaultLoginRequiredEnable: true
diff --git a/src/test/resources/application-xwybjb.yml b/src/test/resources/application-xwybjb.yml
new file mode 100644
index 0000000000000000000000000000000000000000..52cfd6376fa7daade920b2ccc1db2aec72e777e8
--- /dev/null
+++ b/src/test/resources/application-xwybjb.yml
@@ -0,0 +1,94 @@
+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
+    #url: jdbc:postgresql://180.184.65.203:5432/dhmanage
+    url: jdbc:postgresql://localhost:5432/dhmanage
+    username: postgres
+    password: 123456
+    #password: Zdk@824.
+    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
+  #authcenter: http://180.184.65.203:8087
+  authcenter: http://localhost: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
+gainMenuId: 21
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 784527fecc8c0f49945bf28d2765d6dde1edb7ef..7737de8b3bdcfe8aedb6f64772b9664a4ba4cb83 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -25,35 +25,37 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    url: jdbc:postgresql://180.184.65.203:5432/dhmanage
     username: postgres
-    password: 123456
+    #password: 123456
+    password: Zdk@824.
     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
+  #  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会为我们自动转化
+  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
@@ -75,8 +77,11 @@ flowPath: ${rootPath}/flowpath/
 upDatePath: ${rootPath}/updatePath/
 downPath: ${rootPath}/downPath
 eip: http://192.168.1.206:8080/
+
+gainMenuId: 10
 sso:
-  authcenter: http://192.168.1.206:8081
+  ##authcenter: http://192.168.1.206:8081
+  authcenter: http://180.184.65.203:8087
   verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
   passportUrl: ${sso.authcenter}/?ReturnUrl=
   defaultLoginRequiredEnable: true