Merge branch 'dev'

data/1715908499613.json

@@ -0,0 +1,58 @@
+{
+  "displayFieldName": "",
+  "features": [
+    {
+      "attributes": {
+        "RWLX": "辅助选址",
+        "RWBSM": "e2db463b154844f3966d531dd2277ccc"
+      },
+      "geometry": {
+        "rings": [
+          [
+            [
+              108.84986257208,
+              39.332339200433296
+            ],
+            [
+              108.81214489818039,
+              39.33598585084715
+            ],
+            [
+              108.81528803767202,
+              39.31045530399862
+            ],
+            [
+              108.84200472335091,
+              39.31045530399862
+            ],
+            [
+              108.84986257208,
+              39.332339200433296
+            ]
+          ]
+        ]
+      }
+    }
+  ],
+  "fieldAliases": {
+    "RWLX": "RWLX",
+    "RWBSM": "RWBSM"
+  },
+  "fields": [
+    {
+      "alias": "RWBSM",
+      "name": "RWBSM",
+      "type": "esriFieldTypeString"
+    },
+    {
+      "alias": "RWLX",
+      "name": "RWLX",
+      "type": "esriFieldTypeString"
+    }
+  ],
+  "geometryType": "esriGeometryPolygon",
+  "spatialReference": {
+    "latestWkid": 4490,
+    "wkid": 4490
+  }
+}

data/shp/xzqh.cpg

@@ -0,0 +1 @@
+UTF-8

data/shp/xzqh.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/web/domain/StatusMsg.java

@@ -0,0 +1,28 @@
+package com.onemap.common.core.web.domain;
+
+/**
+ * 记录中间处理的逻辑状态信息
+ */
+public class StatusMsg {
+    public String msg = "成功";
+    public Boolean b = true;
+
+    public StatusMsg() {
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Boolean getB() {
+        return b;
+    }
+
+    public void setB(Boolean b) {
+        this.b = b;
+    }
+}

onemap-common/onemap-common-security/src/main/java/com/onemap/common/security/handler/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.onemap.common.security.handler;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;
@@ -19,20 +20,18 @@ import com.onemap.common.core.web.domain.AjaxResult;
 
 /**
  * 全局异常处理器
- * 
+ *
  * @author onemap
  */
 @RestControllerAdvice
-public class GlobalExceptionHandler
-{
+public class GlobalExceptionHandler {
     private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 
     /**
      * 权限码异常
      */
     @ExceptionHandler(NotPermissionException.class)
-    public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request)
-    {
+    public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',权限码校验失败'{}'", requestURI, e.getMessage());
         return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限，请联系管理员授权");
@@ -42,8 +41,7 @@ public class GlobalExceptionHandler
      * 角色权限异常
      */
     @ExceptionHandler(NotRoleException.class)
-    public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request)
-    {
+    public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',角色权限校验失败'{}'", requestURI, e.getMessage());
         return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限，请联系管理员授权");
@@ -54,8 +52,7 @@ public class GlobalExceptionHandler
      */
     @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
     public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
-            HttpServletRequest request)
-    {
+                                                          HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
         return AjaxResult.error(e.getMessage());
@@ -65,8 +62,7 @@ public class GlobalExceptionHandler
      * 业务异常
      */
     @ExceptionHandler(ServiceException.class)
-    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request)
-    {
+    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) {
         log.error(e.getMessage(), e);
         Integer code = e.getCode();
         return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
@@ -76,8 +72,7 @@ public class GlobalExceptionHandler
      * 拦截未知的运行时异常
      */
     @ExceptionHandler(RuntimeException.class)
-    public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)
-    {
+    public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生未知异常.", requestURI, e);
         return AjaxResult.error(e.getMessage());
@@ -87,8 +82,7 @@ public class GlobalExceptionHandler
      * 系统异常
      */
     @ExceptionHandler(Exception.class)
-    public AjaxResult handleException(Exception e, HttpServletRequest request)
-    {
+    public AjaxResult handleException(Exception e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
         return AjaxResult.error(e.getMessage());
@@ -98,8 +92,7 @@ public class GlobalExceptionHandler
      * 自定义验证异常
      */
     @ExceptionHandler(BindException.class)
-    public AjaxResult handleBindException(BindException e)
-    {
+    public AjaxResult handleBindException(BindException e) {
         log.error(e.getMessage(), e);
         String message = e.getAllErrors().get(0).getDefaultMessage();
         return AjaxResult.error(message);
@@ -109,8 +102,7 @@ public class GlobalExceptionHandler
      * 自定义验证异常
      */
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e)
-    {
+    public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         log.error(e.getMessage(), e);
         String message = e.getBindingResult().getFieldError().getDefaultMessage();
         return AjaxResult.error(message);
@@ -120,8 +112,7 @@ public class GlobalExceptionHandler
      * 内部认证异常
      */
     @ExceptionHandler(InnerAuthException.class)
-    public AjaxResult handleInnerAuthException(InnerAuthException e)
-    {
+    public AjaxResult handleInnerAuthException(InnerAuthException e) {
         return AjaxResult.error(e.getMessage());
     }
 
@@ -129,8 +120,7 @@ public class GlobalExceptionHandler
      * 演示模式异常
      */
     @ExceptionHandler(DemoModeException.class)
-    public AjaxResult handleDemoModeException(DemoModeException e)
-    {
+    public AjaxResult handleDemoModeException(DemoModeException e) {
         return AjaxResult.error("演示模式，不允许操作");
     }
 }

onemap-modules/onemap-analyse/pom.xml

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>onemap-modules</artifactId>
+        <groupId>com.onemap</groupId>
+        <version>3.6.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>onemap-modules-analyse</artifactId>
+    <dependencies>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Python -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.python</groupId>-->
+        <!--            <artifactId>jython</artifactId>-->
+        <!--            <version>${org.python.version}</version>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.python</groupId>
+            <artifactId>jython-standalone</artifactId>
+            <version>${org.python.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.onemap</groupId>
+            <artifactId>onemap-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
+        <dependency>
+            <groupId>com.onemap</groupId>
+            <artifactId>onemap-common-datascope</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>com.onemap</groupId>
+            <artifactId>onemap-common-log</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Swagger -->
+        <dependency>
+            <groupId>com.onemap</groupId>
+            <artifactId>onemap-common-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>aspose-words-18.6-jdk16-crack</groupId>
+            <artifactId>aspose-words-18.6-jdk16-crack</artifactId>
+            <version>15.8.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/aspose-words-18.6-jdk16-crack.jar</systemPath>
+        </dependency>
+        <!--zip4j依赖,解压zip压缩-->
+        <dependency>
+            <groupId>net.lingala.zip4j</groupId>
+            <artifactId>zip4j</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <!--   geotools     -->
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-shapefile</artifactId>
+            <version>28-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-swing</artifactId>
+            <version>28-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-epsg-hsql</artifactId>
+            <version>28-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools.jdbc</groupId>
+            <artifactId>gt-jdbc-mysql</artifactId>
+            <version>28-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson</artifactId>
+            <version>28-SNAPSHOT</version>
+        </dependency>
+        <!-- 解析几何geometry对象用的-->
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.19.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gt-jts</groupId>
+            <artifactId>gt-jts</artifactId>
+            <scope>system</scope>
+            <version>1.13</version>
+            <systemPath>${project.basedir}/lib/jts-1.13.jar</systemPath>
+        </dependency>
+
+        <!--supermap-->
+        <dependency>
+            <groupId>com.supermap</groupId>
+            <artifactId>analyst.spatialanalyst</artifactId>
+            <version>11.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/com.supermap.analyst.spatialanalyst.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.supermap</groupId>
+            <artifactId>data</artifactId>
+            <version>11.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/com.supermap.data.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.supermap</groupId>
+            <artifactId>data.conversion</artifactId>
+            <version>11.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/com.supermap.data.conversion.jar</systemPath>
+        </dependency>
+        <!--    简繁体转换    -->
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>69.1</version>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>osgeo</id>
+            <name>OSGeo Release Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>osgeo-snapshot</id>
+            <name>OSGeo Snapshot Repository</name>
+            <url>https://repo.osgeo.org/repository/snapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.6.2</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/OneMapAnalyseApplication.java

@@ -0,0 +1,36 @@
+package com.onemap.analyse;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.onemap.common.security.annotation.EnableCustomConfig;
+import com.onemap.common.security.annotation.EnableRyFeignClients;
+import com.onemap.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * 一张图分析模块
+ * 
+ * @author siwei
+ */
+@EnableScheduling
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class OneMapAnalyseApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(OneMapAnalyseApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  一张图分析模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/config/AsyConfig.java

@@ -0,0 +1,32 @@
+package com.onemap.analyse.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+/**
+ * 开启多线程配置
+ */
+@Configuration
+@EnableAsync
+public class AsyConfig {
+    //TODO 此处成员变量应该使用@Value从配置中读取
+    private int corePoolSize = 10;
+    private int maxPoolSize = 200;
+    private int queueCapacity = 10;
+
+    private Integer time = 0;
+
+    @Bean("taskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(corePoolSize);
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.initialize();
+        return executor;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/ChscController.java

@@ -0,0 +1,100 @@
+package com.onemap.analyse.controller;
+
+import com.onemap.analyse.domain.FzssChscXmgxDTO;
+import com.onemap.analyse.domain.FzxzChscDTO;
+import com.onemap.analyse.service.IChscService;
+import com.onemap.common.core.domain.R;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.WebResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@RequestMapping("/chsc")
+public class ChscController extends BaseController {
+
+    @Autowired
+    private IChscService chscService;
+
+    /**
+     * 安全认证：根据授权码登录获取身份安全认证Token
+     *
+     * @param appid
+     * @return
+     */
+    @PostMapping("/authorize")
+    public R<?> authorize(String appid, HttpServletRequest request, HttpServletResponse response) {
+        R<?> res = chscService.authorize(appid, request, response);
+        return res;
+    }
+
+    /**
+     * 下载选址报告
+     *
+     * @param bsm
+     * @return
+     */
+    @GetMapping("/download")
+    public WebResult download(String bsm, HttpServletRequest request, HttpServletResponse response) {
+        WebResult res = chscService.download(bsm, request, response);
+        return res;
+    }
+
+    /**
+     * 查询项目选址进度
+     *
+     * @param bsm
+     * @return
+     */
+    @GetMapping("/getProgress")
+    public WebResult getProgress(String bsm, HttpServletRequest request, HttpServletResponse response) {
+        WebResult res = chscService.getProgress(bsm, request, response);
+        return res;
+    }
+
+    /**
+     * 更新项目选址结果：项目策划完成，更新选址审批结果
+     *
+     * @param fzssChscXmgxDTO
+     * @return
+     */
+    @PostMapping("/xmjg")
+    public WebResult xmjg(FzssChscXmgxDTO fzssChscXmgxDTO) {
+        WebResult res = chscService.xmjg(fzssChscXmgxDTO);
+        return res;
+    }
+
+    /**
+     * 创建项目选址：根据项目信息，创建选址项目
+     *
+     * @param fzxzChscDTO
+     * @return
+     */
+    @PostMapping("/create")
+    public WebResult create(FzxzChscDTO fzxzChscDTO) {
+        WebResult res = chscService.create(fzxzChscDTO);
+        return res;
+    }
+
+    /**
+     * 文本转SHP文件
+     *
+     * @param file
+     * @param request
+     * @param response
+     * @return
+     */
+    @PostMapping("/txt2shp")
+    public WebResult txt2shp(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+        WebResult res = chscService.txt2shp(file, request, response);
+        return res;
+    }
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -0,0 +1,69 @@
+package com.onemap.analyse.controller;
+
+import com.onemap.analyse.service.IFzssService;
+import com.onemap.analyse.domain.HgxfxEntityDTO;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/fzss")
+public class FzssController extends BaseController {
+
+    @Autowired
+    private IFzssService fzssService;
+
+    /**
+     * 新建合规性分析
+     *
+     * @param hgxfxEntityDTO
+     * @return
+     */
+    @PostMapping("/AddHgxfx")
+    public RequestResult AddHgxfx(@RequestBody HgxfxEntityDTO hgxfxEntityDTO) throws IOException {
+        RequestResult res = fzssService.AddHgxfx(hgxfxEntityDTO);
+        return res;
+    }
+
+    /**
+     * 新建辅助选址
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/AddFzxz")
+    public RequestResult AddFzxz(@RequestBody Map params) {
+        RequestResult res = fzssService.AddFzxz(params);
+        return res;
+    }
+
+    /**
+     * 获取选址结果
+     *
+     * @param bsm
+     * @return
+     */
+    @GetMapping("/GetXzjg")
+    public RequestResult GetXzjg(String bsm) {
+        RequestResult res = fzssService.GetXzjg(bsm);
+        return res;
+    }
+
+    /**
+     * 通过选择的方案生成报告
+     *
+     * @return
+     */
+    @PostMapping("/SaveWordFile")
+    public RequestResult SaveWordFile(@RequestBody Map params) {
+        String bsm = (String) params.get("bsm");
+        ArrayList xzbsm = (ArrayList) params.get("xzbsm");
+        RequestResult res = fzssService.saveWordFile(bsm, xzbsm);
+        return res;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/ToolController.java

@@ -0,0 +1,32 @@
+package com.onemap.analyse.controller;
+
+import com.onemap.analyse.service.IToolService;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.WebResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/tool")
+public class ToolController extends BaseController {
+
+    @Autowired
+    private IToolService toolService;
+
+
+    /**
+     * esrijson转shp
+     *
+     * @param esrijson
+     * @return
+     */
+    @PostMapping("/jsonToShp")
+    public WebResult jsonToShp(String esrijson) {
+        WebResult res = toolService.jsonToShp(esrijson);
+        return res;
+    }
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriFeature.java

@@ -0,0 +1,28 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.Map;
+
+/**
+ * esri要素
+ */
+public class EsriFeature {
+    /// 和fieldAliases一样，用同一个类
+    private Map<String, Object> attributes;
+    private EsriGeometry geometry;
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    public EsriGeometry getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(EsriGeometry geometry) {
+        this.geometry = geometry;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriFeaturePoint.java

@@ -0,0 +1,28 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.Map;
+
+/**
+ * esri要素
+ */
+public class EsriFeaturePoint {
+    /// 和fieldAliases一样，用同一个类
+    private Map<String, Object> attributes;
+    private EsriGeometryPoint geometry;
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    public EsriGeometryPoint getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(EsriGeometryPoint geometry) {
+        this.geometry = geometry;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriFeaturePolyline.java

@@ -0,0 +1,28 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.Map;
+
+/**
+ * esri要素
+ */
+public class EsriFeaturePolyline {
+    /// 和fieldAliases一样，用同一个类
+    private Map<String, Object> attributes;
+    private EsriGeometryPolyline geometry;
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    public EsriGeometryPolyline getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(EsriGeometryPolyline geometry) {
+        this.geometry = geometry;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriField.java

@@ -0,0 +1,42 @@
+package com.onemap.analyse.domain.ESRI;
+
+/**
+ * esri字段
+ */
+public class EsriField {
+    private String name;
+    /// esriFieldTypeString \ esriFieldTypeInteger
+    private String type = "esriFieldTypeString";
+    private String alias;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public EsriField init(String name,String alias){
+        EsriField field = new EsriField();
+        field.setAlias(alias);
+        field.setName(name);
+        return field;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriGeometry.java

@@ -0,0 +1,19 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * esri范围
+ */
+public class EsriGeometry {
+    private List<List<List<Double>>> rings = new ArrayList<List<List<Double>>>();
+
+    public List<List<List<Double>>> getRings() {
+        return rings;
+    }
+
+    public void setRings(List<List<List<Double>>> rings) {
+        this.rings = rings;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriGeometryPoint.java

@@ -0,0 +1,28 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * esri范围
+ */
+public class EsriGeometryPoint {
+    private Double x;
+    private Double y;
+
+    public Double getX() {
+        return x;
+    }
+
+    public void setX(Double x) {
+        this.x = x;
+    }
+
+    public Double getY() {
+        return y;
+    }
+
+    public void setY(Double y) {
+        this.y = y;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriGeometryPolyline.java

@@ -0,0 +1,19 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * esri范围
+ */
+public class EsriGeometryPolyline {
+    private List<List<List<Double>>> paths = new ArrayList<List<List<Double>>>();
+
+    public List<List<List<Double>>> getPaths() {
+        return paths;
+    }
+
+    public void setPaths(List<List<List<Double>>> paths) {
+        this.paths = paths;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriJsonModel.java

@@ -0,0 +1,65 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * esri实体
+ */
+public class EsriJsonModel {
+    private String displayFieldName = "";
+    private Map fieldAliases;
+    private String geometryType = "esriGeometryPolygon";
+    private EsriSpatialReference spatialReference = new EsriSpatialReference();
+    private List<EsriField> fields = new ArrayList<EsriField>();
+    private List<EsriFeature> features = new ArrayList<EsriFeature>();
+
+    public String getDisplayFieldName() {
+        return displayFieldName;
+    }
+
+    public void setDisplayFieldName(String displayFieldName) {
+        this.displayFieldName = displayFieldName;
+    }
+
+    public Map getFieldAliases() {
+        return fieldAliases;
+    }
+
+    public void setFieldAliases(Map fieldAliases) {
+        this.fieldAliases = fieldAliases;
+    }
+
+    public String getGeometryType() {
+        return geometryType;
+    }
+
+    public void setGeometryType(String geometryType) {
+        this.geometryType = geometryType;
+    }
+
+    public EsriSpatialReference getSpatialReference() {
+        return spatialReference;
+    }
+
+    public void setSpatialReference(EsriSpatialReference spatialReference) {
+        this.spatialReference = spatialReference;
+    }
+
+    public List<EsriField> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<EsriField> fields) {
+        this.fields = fields;
+    }
+
+    public List<EsriFeature> getFeatures() {
+        return features;
+    }
+
+    public void setFeatures(List<EsriFeature> features) {
+        this.features = features;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriJsonModelPoint.java

@@ -0,0 +1,65 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * esri实体
+ */
+public class EsriJsonModelPoint {
+    private String displayFieldName = "";
+    private Map fieldAliases;
+    private String geometryType = "esriGeometryPoint";
+    private EsriSpatialReference spatialReference = new EsriSpatialReference();
+    private List<EsriField> fields = new ArrayList<EsriField>();
+    private List<EsriFeaturePoint> features = new ArrayList<EsriFeaturePoint>();
+
+    public String getDisplayFieldName() {
+        return displayFieldName;
+    }
+
+    public void setDisplayFieldName(String displayFieldName) {
+        this.displayFieldName = displayFieldName;
+    }
+
+    public Map getFieldAliases() {
+        return fieldAliases;
+    }
+
+    public void setFieldAliases(Map fieldAliases) {
+        this.fieldAliases = fieldAliases;
+    }
+
+    public String getGeometryType() {
+        return geometryType;
+    }
+
+    public void setGeometryType(String geometryType) {
+        this.geometryType = geometryType;
+    }
+
+    public EsriSpatialReference getSpatialReference() {
+        return spatialReference;
+    }
+
+    public void setSpatialReference(EsriSpatialReference spatialReference) {
+        this.spatialReference = spatialReference;
+    }
+
+    public List<EsriField> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<EsriField> fields) {
+        this.fields = fields;
+    }
+
+    public List<EsriFeaturePoint> getFeatures() {
+        return features;
+    }
+
+    public void setFeatures(List<EsriFeaturePoint> features) {
+        this.features = features;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriJsonModelPolyline.java

@@ -0,0 +1,65 @@
+package com.onemap.analyse.domain.ESRI;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * esri实体
+ */
+public class EsriJsonModelPolyline {
+    private String displayFieldName = "";
+    private Map fieldAliases;
+    private String geometryType = "esriGeometryPolyline";
+    private EsriSpatialReference spatialReference = new EsriSpatialReference();
+    private List<EsriField> fields = new ArrayList<EsriField>();
+    private List<EsriFeaturePolyline> features = new ArrayList<EsriFeaturePolyline>();
+
+    public String getDisplayFieldName() {
+        return displayFieldName;
+    }
+
+    public void setDisplayFieldName(String displayFieldName) {
+        this.displayFieldName = displayFieldName;
+    }
+
+    public Map getFieldAliases() {
+        return fieldAliases;
+    }
+
+    public void setFieldAliases(Map fieldAliases) {
+        this.fieldAliases = fieldAliases;
+    }
+
+    public String getGeometryType() {
+        return geometryType;
+    }
+
+    public void setGeometryType(String geometryType) {
+        this.geometryType = geometryType;
+    }
+
+    public EsriSpatialReference getSpatialReference() {
+        return spatialReference;
+    }
+
+    public void setSpatialReference(EsriSpatialReference spatialReference) {
+        this.spatialReference = spatialReference;
+    }
+
+    public List<EsriField> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<EsriField> fields) {
+        this.fields = fields;
+    }
+
+    public List<EsriFeaturePolyline> getFeatures() {
+        return features;
+    }
+
+    public void setFeatures(List<EsriFeaturePolyline> features) {
+        this.features = features;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ESRI/EsriSpatialReference.java

@@ -0,0 +1,26 @@
+package com.onemap.analyse.domain.ESRI;
+
+/**
+ * esri坐标
+ */
+public class EsriSpatialReference {
+    //public string wkt { set; get; } = "GEOGCS[\"GCS_CGCS_2000\",DATUM[\"D_CGCS_2000\",SPHEROID[\"CGCS_2000\",6378137.0,298.257222101]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]]";
+    private Integer wkid = 4490;
+    private Integer latestWkid = 4490;
+
+    public Integer getWkid() {
+        return wkid;
+    }
+
+    public void setWkid(Integer wkid) {
+        this.wkid = wkid;
+    }
+
+    public Integer getLatestWkid() {
+        return latestWkid;
+    }
+
+    public void setLatestWkid(Integer latestWkid) {
+        this.latestWkid = latestWkid;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/Field.java

@@ -0,0 +1,41 @@
+package com.onemap.analyse.domain;
+
+public class Field {
+    /// 名称
+    private String name;
+    /// 类型
+    private String type = "TEXT";
+    /// 值
+    private Object value;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public Field init(String name, String value) {
+        Field a = new Field();
+        a.setName(name);
+        a.setValue(value);
+        return a;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FxReport.java

@@ -0,0 +1,40 @@
+package com.onemap.analyse.domain;
+
+public class FxReport {
+    private String message = "检查完成";/// 消息内容
+    private String reportfile;/// 文件
+    private Double mj;/// 面积
+    private String pdffile;/// 面积
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getReportfile() {
+        return reportfile;
+    }
+
+    public void setReportfile(String reportfile) {
+        this.reportfile = reportfile;
+    }
+
+    public Double getMj() {
+        return mj;
+    }
+
+    public void setMj(Double mj) {
+        this.mj = mj;
+    }
+
+    public String getPdffile() {
+        return pdffile;
+    }
+
+    public void setPdffile(String pdffile) {
+        this.pdffile = pdffile;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FxfwDictDTO.java

@@ -0,0 +1,23 @@
+package com.onemap.analyse.domain;
+
+/**
+ * 分析范围字典配置
+ */
+public class FxfwDictDTO
+{
+    private Integer region = 0;/// 行政区
+    private Integer draw = 1;/// 绘制
+    private Integer shp = 2;/// Shp文件
+
+    public Integer getRegion() {
+        return region;
+    }
+
+    public Integer getDraw() {
+        return draw;
+    }
+
+    public Integer getShp() {
+        return shp;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FxrwrzDTO.java

@@ -0,0 +1,75 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+/**
+ * 分析任务日志
+ */
+@TableName("t_fzss_fxrwrz")
+public class FxrwrzDTO {
+    private String bsm;
+    private String rwlx;
+    private String rwbsm;
+    private String rzlx;
+    private Date rzsj;
+    private String fxjg;
+    private String rzlr;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwlx() {
+        return rwlx;
+    }
+
+    public void setRwlx(String rwlx) {
+        this.rwlx = rwlx;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getRzlx() {
+        return rzlx;
+    }
+
+    public void setRzlx(String rzlx) {
+        this.rzlx = rzlx;
+    }
+
+    public Date getRzsj() {
+        return rzsj;
+    }
+
+    public void setRzsj(Date rzsj) {
+        this.rzsj = rzsj;
+    }
+
+    public String getFxjg() {
+        return fxjg;
+    }
+
+    public void setFxjg(String fxjg) {
+        this.fxjg = fxjg;
+    }
+
+    public String getRzlr() {
+        return rzlr;
+    }
+
+    public void setRzlr(String rzlr) {
+        this.rzlr = rzlr;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzssChscFileDTO.java

@@ -0,0 +1,34 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("t_fzss_zhxz_file")
+public class FzssChscFileDTO {
+    private String bsm ;
+    private String wj ;
+    private String yswj ;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getWj() {
+        return wj;
+    }
+
+    public void setWj(String wj) {
+        this.wj = wj;
+    }
+
+    public String getYswj() {
+        return yswj;
+    }
+
+    public void setYswj(String yswj) {
+        this.yswj = yswj;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzssChscXmgxDTO.java

@@ -0,0 +1,67 @@
+package com.onemap.analyse.domain;
+
+public class FzssChscXmgxDTO {
+    private String bsm;//标识码
+    private Integer chzt;//策划状态（1通过 2未通过 3删除）*只有策划状态为1时，才会将项目由储备库转至实施库
+    private String chjg;//策划结果（原因）
+    private String bgfw;//如果范围调整，需要上传最终的shp范围（接口2）
+    private Double bgmj;//变更面积，平方米，两位小数  条件必填 ，变更原因不能为空
+    private String bgyy;//变更原因，如果项目范围变更，变更原因不能为空
+    private String bz;//备注
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public Integer getChzt() {
+        return chzt;
+    }
+
+    public void setChzt(Integer chzt) {
+        this.chzt = chzt;
+    }
+
+    public String getChjg() {
+        return chjg;
+    }
+
+    public void setChjg(String chjg) {
+        this.chjg = chjg;
+    }
+
+    public String getBgfw() {
+        return bgfw;
+    }
+
+    public void setBgfw(String bgfw) {
+        this.bgfw = bgfw;
+    }
+
+    public Double getBgmj() {
+        return bgmj;
+    }
+
+    public void setBgmj(Double bgmj) {
+        this.bgmj = bgmj;
+    }
+
+    public String getBgyy() {
+        return bgyy;
+    }
+
+    public void setBgyy(String bgyy) {
+        this.bgyy = bgyy;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzssSystemDTO.java

@@ -0,0 +1,72 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("t_fzss_system_config")
+public class FzssSystemDTO {
+    private String id;
+    private String name;
+    private String applicant;
+    private String ip;
+    private String remark;
+    private String username;
+    private Date jssj;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getApplicant() {
+        return applicant;
+    }
+
+    public void setApplicant(String applicant) {
+        this.applicant = applicant;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getJssj() {
+        return jssj;
+    }
+
+    public void setJssj(Date jssj) {
+        this.jssj = jssj;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzChscDTO.java

@@ -0,0 +1,376 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.onemap.common.core.utils.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@TableName("t_fzss_zhxz_chsc")
+public class FzxzChscDTO {
+    private String bsm;
+    private Integer xzlb;
+    private String xmbm;
+    private String xmmc;
+    private String xmdm;
+    private Integer fwlx;
+    private String xzfw;
+    private String ydmjks;
+    private String ydmjjs;
+    private Integer jzgd;
+    private String ywlx;
+    private String ntzlx;
+    private String ntznx;
+    private String jsxz;
+    private Integer ztze;
+    private Integer sfylrndys;
+    private String xmjsyj;
+    private String njsdz;
+    private String xzqbm;
+    private String xzqmc;
+    private String jsgmjnr;
+    private Double nydmj;
+    private String ydbpzbwj;
+    private String xmlxrmc;
+    private String sbdw;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date sbsj;
+    private String lxdh;
+    private String bz;
+    private Integer rwzt;
+    private Integer rwjd;
+    private String rwjg;
+    private String chzt;
+    private String chjg;
+    private String bgfw;
+    private Double bgmj;
+    private String bgyy;
+    private String chbz;
+    private String yxyz;
+    private Date cjsj;
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public boolean paramsChecked() {
+        if (StringUtils.isEmpty(xmbm)
+                || StringUtils.isEmpty(xmmc)
+                || StringUtils.isEmpty(xzfw)
+                || StringUtils.isEmpty(ydbpzbwj)
+                || StringUtils.isEmpty(sbdw)
+                || StringUtils.isEmpty(lxdh)
+        ) {
+            return false;
+        }
+        return true;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public Integer getXzlb() {
+        return xzlb;
+    }
+
+    public void setXzlb(Integer xzlb) {
+        this.xzlb = xzlb;
+    }
+
+    public String getXmbm() {
+        return xmbm;
+    }
+
+    public void setXmbm(String xmbm) {
+        this.xmbm = xmbm;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmdm() {
+        return xmdm;
+    }
+
+    public void setXmdm(String xmdm) {
+        this.xmdm = xmdm;
+    }
+
+    public Integer getFwlx() {
+        return fwlx;
+    }
+
+    public void setFwlx(Integer fwlx) {
+        this.fwlx = fwlx;
+    }
+
+    public String getXzfw() {
+        return xzfw;
+    }
+
+    public void setXzfw(String xzfw) {
+        this.xzfw = xzfw;
+    }
+
+    public String getYdmjks() {
+        return ydmjks;
+    }
+
+    public void setYdmjks(String ydmjks) {
+        this.ydmjks = ydmjks;
+    }
+
+    public String getYdmjjs() {
+        return ydmjjs;
+    }
+
+    public void setYdmjjs(String ydmjjs) {
+        this.ydmjjs = ydmjjs;
+    }
+
+    public Integer getJzgd() {
+        return jzgd;
+    }
+
+    public void setJzgd(Integer jzgd) {
+        this.jzgd = jzgd;
+    }
+
+    public String getYwlx() {
+        return ywlx;
+    }
+
+    public void setYwlx(String ywlx) {
+        this.ywlx = ywlx;
+    }
+
+    public String getNtzlx() {
+        return ntzlx;
+    }
+
+    public void setNtzlx(String ntzlx) {
+        this.ntzlx = ntzlx;
+    }
+
+    public String getNtznx() {
+        return ntznx;
+    }
+
+    public void setNtznx(String ntznx) {
+        this.ntznx = ntznx;
+    }
+
+    public String getJsxz() {
+        return jsxz;
+    }
+
+    public void setJsxz(String jsxz) {
+        this.jsxz = jsxz;
+    }
+
+    public Integer getZtze() {
+        return ztze;
+    }
+
+    public void setZtze(Integer ztze) {
+        this.ztze = ztze;
+    }
+
+    public Integer getSfylrndys() {
+        return sfylrndys;
+    }
+
+    public void setSfylrndys(Integer sfylrndys) {
+        this.sfylrndys = sfylrndys;
+    }
+
+    public String getXmjsyj() {
+        return xmjsyj;
+    }
+
+    public void setXmjsyj(String xmjsyj) {
+        this.xmjsyj = xmjsyj;
+    }
+
+    public String getNjsdz() {
+        return njsdz;
+    }
+
+    public void setNjsdz(String njsdz) {
+        this.njsdz = njsdz;
+    }
+
+    public String getXzqbm() {
+        return xzqbm;
+    }
+
+    public void setXzqbm(String xzqbm) {
+        this.xzqbm = xzqbm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public String getJsgmjnr() {
+        return jsgmjnr;
+    }
+
+    public void setJsgmjnr(String jsgmjnr) {
+        this.jsgmjnr = jsgmjnr;
+    }
+
+    public Double getNydmj() {
+        return nydmj;
+    }
+
+    public void setNydmj(Double nydmj) {
+        this.nydmj = nydmj;
+    }
+
+    public String getYdbpzbwj() {
+        return ydbpzbwj;
+    }
+
+    public void setYdbpzbwj(String ydbpzbwj) {
+        this.ydbpzbwj = ydbpzbwj;
+    }
+
+    public String getXmlxrmc() {
+        return xmlxrmc;
+    }
+
+    public void setXmlxrmc(String xmlxrmc) {
+        this.xmlxrmc = xmlxrmc;
+    }
+
+    public String getSbdw() {
+        return sbdw;
+    }
+
+    public void setSbdw(String sbdw) {
+        this.sbdw = sbdw;
+    }
+
+    public Date getSbsj() {
+        return sbsj;
+    }
+
+    public void setSbsj(Date sbsj) {
+        this.sbsj = sbsj;
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public Integer getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(Integer rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public Integer getRwjd() {
+        return rwjd;
+    }
+
+    public void setRwjd(Integer rwjd) {
+        this.rwjd = rwjd;
+    }
+
+    public String getRwjg() {
+        return rwjg;
+    }
+
+    public void setRwjg(String rwjg) {
+        this.rwjg = rwjg;
+    }
+
+    public String getChzt() {
+        return chzt;
+    }
+
+    public void setChzt(String chzt) {
+        this.chzt = chzt;
+    }
+
+    public String getChjg() {
+        return chjg;
+    }
+
+    public void setChjg(String chjg) {
+        this.chjg = chjg;
+    }
+
+    public String getBgfw() {
+        return bgfw;
+    }
+
+    public void setBgfw(String bgfw) {
+        this.bgfw = bgfw;
+    }
+
+    public Double getBgmj() {
+        return bgmj;
+    }
+
+    public void setBgmj(Double bgmj) {
+        this.bgmj = bgmj;
+    }
+
+    public String getBgyy() {
+        return bgyy;
+    }
+
+    public void setBgyy(String bgyy) {
+        this.bgyy = bgyy;
+    }
+
+    public String getChbz() {
+        return chbz;
+    }
+
+    public void setChbz(String chbz) {
+        this.chbz = chbz;
+    }
+
+    public String getYxyz() {
+        return yxyz;
+    }
+
+    public void setYxyz(String yxyz) {
+        this.yxyz = yxyz;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzChscProgressDTO.java

@@ -0,0 +1,45 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class FzxzChscProgressDTO {
+    private String bsm ;
+    private String msg ;
+    private Integer state ;
+    private Integer jd ;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getJd() {
+        return jd;
+    }
+
+    public void setJd(Integer jd) {
+        this.jd = jd;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzDTO.java

@@ -0,0 +1,180 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("t_fzss_fzxz")
+public class FzxzDTO {
+    private String bsm;
+    private Integer rwzt;
+    private Date cjsj;
+    private String cjyh;
+    private Date rwkssj;
+    private Date rwjssj;
+    private String fxbg;
+    private String zip;
+    private String ydxz_bsm;
+    private String ydmjbegin;
+    private String ydmjend;
+    private String kddk;
+    private String zdpd;
+    private Double xzmj;
+    private String sjy;
+    private String xzfw; //fwlx=1：wkt格式，4326，区域面积；fwlx=2：shp文件地址
+    private String xmmc;
+    private String jsdw;
+    private Integer fwlx;//0:行政区划，1:绘制，2:Shp文件
+
+    public String getCjyh() {
+        return cjyh;
+    }
+
+    public void setCjyh(String cjyh) {
+        this.cjyh = cjyh;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public Integer getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(Integer rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public Date getRwkssj() {
+        return rwkssj;
+    }
+
+    public void setRwkssj(Date rwkssj) {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwjssj() {
+        return rwjssj;
+    }
+
+    public void setRwjssj(Date rwjssj) {
+        this.rwjssj = rwjssj;
+    }
+
+    public String getFxbg() {
+        return fxbg;
+    }
+
+    public void setFxbg(String fxbg) {
+        this.fxbg = fxbg;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getYdxz_bsm() {
+        return ydxz_bsm;
+    }
+
+    public void setYdxz_bsm(String ydxz_bsm) {
+        this.ydxz_bsm = ydxz_bsm;
+    }
+
+    public String getYdmjbegin() {
+        return ydmjbegin;
+    }
+
+    public void setYdmjbegin(String ydmjbegin) {
+        this.ydmjbegin = ydmjbegin;
+    }
+
+    public String getYdmjend() {
+        return ydmjend;
+    }
+
+    public void setYdmjend(String ydmjend) {
+        this.ydmjend = ydmjend;
+    }
+
+    public String getKddk() {
+        return kddk;
+    }
+
+    public void setKddk(String kddk) {
+        this.kddk = kddk;
+    }
+
+    public String getZdpd() {
+        return zdpd;
+    }
+
+    public void setZdpd(String zdpd) {
+        this.zdpd = zdpd;
+    }
+
+    public Double getXzmj() {
+        return xzmj;
+    }
+
+    public void setXzmj(Double xzmj) {
+        this.xzmj = xzmj;
+    }
+
+    public String getSjy() {
+        return sjy;
+    }
+
+    public void setSjy(String sjy) {
+        this.sjy = sjy;
+    }
+
+    public String getXzfw() {
+        return xzfw;
+    }
+
+    public void setXzfw(String xzfw) {
+        this.xzfw = xzfw;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getJsdw() {
+        return jsdw;
+    }
+
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
+    }
+
+    public Integer getFwlx() {
+        return fwlx;
+    }
+
+    public void setFwlx(Integer fwlx) {
+        this.fwlx = fwlx;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzEntityDTO.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzEntityDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.analyse.domain;
 
 //辅助选址分析列表
 public class FzxzEntityDTO {

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzJgGisDTO.java

@@ -0,0 +1,130 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@TableName("t_fzss_fzxz_jg_gis")
+public class FzxzJgGisDTO {
+    private Integer objectid;
+    private String bsm;
+    private String rwbsm;
+    private String dlb;
+    private String dlbm;
+    private String dlmc;
+    private Date cjsj;
+    private String yxfa;
+    private String bz;
+    private Double tbmj;
+    private String xzqdm;
+    private String xzqmc;
+    @TableField(exist = false)
+    private List<FzxzJgyzDTO> fxyzjg = new ArrayList<FzxzJgyzDTO>();
+
+    public Integer getObjectid() {
+        return objectid;
+    }
+
+    public void setObjectid(Integer objectid) {
+        this.objectid = objectid;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getDlb() {
+        return dlb;
+    }
+
+    public void setDlb(String dlb) {
+        this.dlb = dlb;
+    }
+
+    public String getDlbm() {
+        return dlbm;
+    }
+
+    public void setDlbm(String dlbm) {
+        this.dlbm = dlbm;
+    }
+
+    public String getDlmc() {
+        return dlmc;
+    }
+
+    public void setDlmc(String dlmc) {
+        this.dlmc = dlmc;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getYxfa() {
+        return yxfa;
+    }
+
+    public void setYxfa(String yxfa) {
+        this.yxfa = yxfa;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public Double getTbmj() {
+        return tbmj;
+    }
+
+    public void setTbmj(Double tbmj) {
+        this.tbmj = tbmj;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public List<FzxzJgyzDTO> getFxyzjg() {
+        return fxyzjg;
+    }
+
+    public void setFxyzjg(List<FzxzJgyzDTO> fxyzjg) {
+        this.fxyzjg = fxyzjg;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzJgyzDTO.java

@@ -0,0 +1,70 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("t_fzss_fzxz_jgyz")
+public class FzxzJgyzDTO {
+    private String bsm;
+    private String jbbsm;
+    private String yzbsm;
+    private String yxyzmc;
+    private String yztj;
+    private String yxz;
+    private String fxjg;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getJbbsm() {
+        return jbbsm;
+    }
+
+    public void setJbbsm(String jbbsm) {
+        this.jbbsm = jbbsm;
+    }
+
+    public String getYzbsm() {
+        return yzbsm;
+    }
+
+    public void setYzbsm(String yzbsm) {
+        this.yzbsm = yzbsm;
+    }
+
+    public String getYxyzmc() {
+        return yxyzmc;
+    }
+
+    public void setYxyzmc(String yxyzmc) {
+        this.yxyzmc = yxyzmc;
+    }
+
+    public String getYztj() {
+        return yztj;
+    }
+
+    public void setYztj(String yztj) {
+        this.yztj = yztj;
+    }
+
+    public String getYxz() {
+        return yxz;
+    }
+
+    public void setYxz(String yxz) {
+        this.yxz = yxz;
+    }
+
+    public String getFxjg() {
+        return fxjg;
+    }
+
+    public void setFxjg(String fxjg) {
+        this.fxjg = fxjg;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzReport.java

@@ -0,0 +1,97 @@
+package com.onemap.analyse.domain;
+
+import java.util.List;
+
+public class FzxzReport {
+    private String message = "检查完成";/// 消息内容
+    private String reportfile;/// 选址报告文件
+    private String simplefile;/// 选址简报文件
+    private String zipfile;/// 文件
+    private String rootPath;/// 根目录
+
+    private String bsm;
+    private String fxbg;
+    private String jsdw;
+    private String xmmc;
+    private List<FzxzJgGisDTO> items;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getReportfile() {
+        return reportfile;
+    }
+
+    public void setReportfile(String reportfile) {
+        this.reportfile = reportfile;
+    }
+
+    public String getSimplefile() {
+        return simplefile;
+    }
+
+    public void setSimplefile(String simplefile) {
+        this.simplefile = simplefile;
+    }
+
+    public String getZipfile() {
+        return zipfile;
+    }
+
+    public void setZipfile(String zipfile) {
+        this.zipfile = zipfile;
+    }
+
+    public String getRootPath() {
+        return rootPath;
+    }
+
+    public void setRootPath(String rootPath) {
+        this.rootPath = rootPath;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getFxbg() {
+        return fxbg;
+    }
+
+    public void setFxbg(String fxbg) {
+        this.fxbg = fxbg;
+    }
+
+    public String getJsdw() {
+        return jsdw;
+    }
+
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public List<FzxzJgGisDTO> getItems() {
+        return items;
+    }
+
+    public void setItems(List<FzxzJgGisDTO> items) {
+        this.items = items;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzResultDTO.java

@@ -0,0 +1,55 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@TableName("t_fzss_fzxz")
+public class FzxzResultDTO {
+    private String bsm;
+    private String xmmc;
+    private String jsdw;
+    private String fxbg;
+    private List<FzxzJgGisDTO> items = new ArrayList<FzxzJgGisDTO>();
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getJsdw() {
+        return jsdw;
+    }
+
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
+    }
+
+    public String getFxbg() {
+        return fxbg;
+    }
+
+    public void setFxbg(String fxbg) {
+        this.fxbg = fxbg;
+    }
+
+    public List<FzxzJgGisDTO> getItems() {
+        return items;
+    }
+
+    public void setItems(List<FzxzJgGisDTO> items) {
+        this.items = items;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzTbEntityDTO.java

@@ -0,0 +1,67 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+//辅助选址分析列表
+@TableName("T_FZSS_FZXZ_TB")
+public class FzxzTbEntityDTO {
+    private int objectid;
+    //选址标识码
+    private String rwbsm;
+    //地类编码
+    private String ydyhfldm;
+    //地类名称
+    private String ydyhflmc;
+    //图斑数量
+    private double frequency;
+    //汇总面积
+    private double sumMj;
+
+    public int getObjectid() {
+        return objectid;
+    }
+
+    public void setObjectid(int objectid) {
+        this.objectid = objectid;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getYdyhfldm() {
+        return ydyhfldm;
+    }
+
+    public void setYdyhfldm(String ydyhfldm) {
+        this.ydyhfldm = ydyhfldm;
+    }
+
+    public String getYdyhflmc() {
+        return ydyhflmc;
+    }
+
+    public void setYdyhflmc(String ydyhflmc) {
+        this.ydyhflmc = ydyhflmc;
+    }
+
+    public double getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(double frequency) {
+        this.frequency = frequency;
+    }
+
+    public double getSumMj() {
+        return sumMj;
+    }
+
+    public void setSumMj(double sumMj) {
+        this.sumMj = sumMj;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzXzyzDTO.java

@@ -0,0 +1,62 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+//辅助选址选址因子,任务中使用
+@TableName("t_fzss_fzxz_xzyz")
+public class FzxzXzyzDTO {
+    private String bsm;
+    private String rwbsm;
+    private String yzbsm;
+    private String yxyzmc;
+    private String yztj;
+    private String yxz;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getYzbsm() {
+        return yzbsm;
+    }
+
+    public void setYzbsm(String yzbsm) {
+        this.yzbsm = yzbsm;
+    }
+
+    public String getYxyzmc() {
+        return yxyzmc;
+    }
+
+    public void setYxyzmc(String yxyzmc) {
+        this.yxyzmc = yxyzmc;
+    }
+
+    public String getYztj() {
+        return yztj;
+    }
+
+    public void setYztj(String yztj) {
+        this.yztj = yztj;
+    }
+
+    public String getYxz() {
+        return yxz;
+    }
+
+    public void setYxz(String yxz) {
+        this.yxz = yxz;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/GeoJSON/Feature.java

@@ -0,0 +1,31 @@
+package com.onemap.analyse.domain.GeoJSON;
+
+public class Feature {
+    private String type = "Feature";
+    private Geometry geometry  = new Geometry();
+    private Object properties  = new Object();
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Geometry getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(Geometry geometry) {
+        this.geometry = geometry;
+    }
+
+    public Object getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Object properties) {
+        this.properties = properties;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/GeoJSON/GeoJsonModel.java

@@ -0,0 +1,9 @@
+package com.onemap.analyse.domain.GeoJSON;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GeoJsonModel {
+    private String type = "FeatureCollection";
+    private List<Feature> features = new ArrayList<Feature>();
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/GeoJSON/Geometry.java

@@ -0,0 +1,25 @@
+package com.onemap.analyse.domain.GeoJSON;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Geometry {
+    private String type = "Polygon";
+    private List<List<List<Double>>> coordinates = new ArrayList<List<List<Double>>>();
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public List<List<List<Double>>> getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(List<List<List<Double>>> coordinates) {
+        this.coordinates = coordinates;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxDTO.java

@@ -0,0 +1,129 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+/**
+ * 合规性分析
+ */
+@TableName("t_fzss_hgxfx")
+public class HgxfxDTO {
+    private String bsm;
+    private Double fxmj;
+    private String xmmc;
+    private String xmlx;
+    private String jsdw;
+    private String ydxz_bsm;
+    private String fxbg;
+    private Integer rwzt;
+    private Date rwkssj;
+    private Date rwjssj;
+    private String cjyh;
+    private String rwly;
+    private Date cjsj;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public Double getFxmj() {
+        return fxmj;
+    }
+
+    public void setFxmj(Double fxmj) {
+        this.fxmj = fxmj;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmlx() {
+        return xmlx;
+    }
+
+    public void setXmlx(String xmlx) {
+        this.xmlx = xmlx;
+    }
+
+    public String getJsdw() {
+        return jsdw;
+    }
+
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
+    }
+
+    public String getYdxz_bsm() {
+        return ydxz_bsm;
+    }
+
+    public void setYdxz_bsm(String ydxz_bsm) {
+        this.ydxz_bsm = ydxz_bsm;
+    }
+
+    public String getFxbg() {
+        return fxbg;
+    }
+
+    public void setFxbg(String fxbg) {
+        this.fxbg = fxbg;
+    }
+
+    public Integer getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(Integer rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public Date getRwkssj() {
+        return rwkssj;
+    }
+
+    public void setRwkssj(Date rwkssj) {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwjssj() {
+        return rwjssj;
+    }
+
+    public void setRwjssj(Date rwjssj) {
+        this.rwjssj = rwjssj;
+    }
+
+    public String getCjyh() {
+        return cjyh;
+    }
+
+    public void setCjyh(String cjyh) {
+        this.cjyh = cjyh;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getRwly() {
+        return rwly;
+    }
+
+    public void setRwly(String rwly) {
+        this.rwly = rwly;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxEntityDTO.java

@@ -0,0 +1,182 @@
+package com.onemap.analyse.domain;
+
+import java.util.Date;
+import java.util.List;
+
+public class HgxfxEntityDTO {
+    /// 项目名称
+    public String xmmc;
+
+    /// 项目类型
+    public String xmlx;
+
+    /// 建设单位
+    public String jsdw;
+
+    /// 用地性质标识码
+    public String ydxz_bsm;
+
+    /// 建筑高度，单位米，两位小数
+    public Double jzgd;
+
+    /// 项目联系人名称
+    public String xmlxrmc;
+
+    /// 申报单位
+    public String sbdw;
+
+    /// 申报日期
+    public Date sbsj;
+
+    /// 联系电话
+    public String lxdh;
+
+    /// 划拨类/出让类/一般经营性类/工业类
+    public String ywlx;
+
+    /// 审查模板（划拨类/出让类/一般经营性类/工业类）
+    /// 审查模板有就使用审查模板，否则使用审查项（用户自定）
+    public String scmb;
+
+    /// 审查项（自定义）
+    public String scxs;
+
+    /// 范围类型(1绘制  2SHP文件)
+    public Integer fwlx;
+
+    /// 范围(存面BSM)
+    public String xzfw;
+    /// 分析面积
+    public Double xzmj;
+
+    //任务来源
+    private String rwly = "Web";
+
+    public Double getXzmj() {
+        return xzmj;
+    }
+
+    public void setXzmj(Double xzmj) {
+        this.xzmj = xzmj;
+    }
+
+    public String getRwly() {
+        return rwly;
+    }
+
+    public void setRwly(String rwly) {
+        this.rwly = rwly;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmlx() {
+        return xmlx;
+    }
+
+    public void setXmlx(String xmlx) {
+        this.xmlx = xmlx;
+    }
+
+    public String getJsdw() {
+        return jsdw;
+    }
+
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
+    }
+
+    public String getYdxz_bsm() {
+        return ydxz_bsm;
+    }
+
+    public void setYdxz_bsm(String ydxz_bsm) {
+        this.ydxz_bsm = ydxz_bsm;
+    }
+
+    public Double getJzgd() {
+        return jzgd;
+    }
+
+    public void setJzgd(Double jzgd) {
+        this.jzgd = jzgd;
+    }
+
+    public String getXmlxrmc() {
+        return xmlxrmc;
+    }
+
+    public void setXmlxrmc(String xmlxrmc) {
+        this.xmlxrmc = xmlxrmc;
+    }
+
+    public String getSbdw() {
+        return sbdw;
+    }
+
+    public void setSbdw(String sbdw) {
+        this.sbdw = sbdw;
+    }
+
+    public Date getSbsj() {
+        return sbsj;
+    }
+
+    public void setSbsj(Date sbsj) {
+        this.sbsj = sbsj;
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh;
+    }
+
+    public String getYwlx() {
+        return ywlx;
+    }
+
+    public void setYwlx(String ywlx) {
+        this.ywlx = ywlx;
+    }
+
+    public String getScmb() {
+        return scmb;
+    }
+
+    public void setScmb(String scmb) {
+        this.scmb = scmb;
+    }
+
+    public String getScxs() {
+        return scxs;
+    }
+
+    public void setScxs(String scxs) {
+        this.scxs = scxs;
+    }
+
+    public Integer getFwlx() {
+        return fwlx;
+    }
+
+    public void setFwlx(Integer fwlx) {
+        this.fwlx = fwlx;
+    }
+
+    public String getXzfw() {
+        return xzfw;
+    }
+
+    public void setXzfw(String xzfw) {
+        this.xzfw = xzfw;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxFxtbDTO.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxFxtbDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.analyse.domain;
 
 //合规性分析结果 现状图斑信息
 public class HgxfxFxtbDTO {

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxGisDTO.java

@@ -0,0 +1,101 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+//分析结果图斑表
+//合规性分析
+@TableName("t_fzss_hgxfx_jg_gis")
+public class HgxfxGisDTO {
+    private Integer objectid;
+    private String bsm;
+    private String rwbsm;
+    private String scxbsm;
+    private String ysmc;
+    private Double yzmj;
+    private Integer objid;
+    private Date cjsj;
+    private String bz;
+    private String ysdm;
+
+    public Integer getObjectid() {
+        return objectid;
+    }
+
+    public void setObjectid(Integer objectid) {
+        this.objectid = objectid;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getScxbsm() {
+        return scxbsm;
+    }
+
+    public void setScxbsm(String scxbsm) {
+        this.scxbsm = scxbsm;
+    }
+
+    public String getYsmc() {
+        return ysmc;
+    }
+
+    public void setYsmc(String ysmc) {
+        this.ysmc = ysmc;
+    }
+
+    public Double getYzmj() {
+        return yzmj;
+    }
+
+    public void setYzmj(Double yzmj) {
+        this.yzmj = yzmj;
+    }
+
+    public Integer getObjid() {
+        return objid;
+    }
+
+    public void setObjid(Integer objid) {
+        this.objid = objid;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getYsdm() {
+        return ysdm;
+    }
+
+    public void setYsdm(String ysdm) {
+        this.ysdm = ysdm;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxHgscxDTO.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxHgscxDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxHgscxExportDTO.java

@@ -0,0 +1,115 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+//合规性任务审查项
+public class HgxfxHgscxExportDTO {
+    private String bsm;
+    private String rwbsm;
+    private String scxbsm;
+    private String ysmc;
+    private Double zdmj;
+    private String jcjg;
+    private String ysdm;
+    private String sjy;
+    private Integer kzxjb;
+    private Integer xssx;
+    private String tjzd;
+    private Integer status;
+
+    public String getYsdm() {
+        return ysdm;
+    }
+
+    public void setYsdm(String ysdm) {
+        this.ysdm = ysdm;
+    }
+
+    public String getSjy() {
+        return sjy;
+    }
+
+    public void setSjy(String sjy) {
+        this.sjy = sjy;
+    }
+
+    public Integer getKzxjb() {
+        return kzxjb;
+    }
+
+    public void setKzxjb(Integer kzxjb) {
+        this.kzxjb = kzxjb;
+    }
+
+    public Integer getXssx() {
+        return xssx;
+    }
+
+    public void setXssx(Integer xssx) {
+        this.xssx = xssx;
+    }
+
+    public String getTjzd() {
+        return tjzd;
+    }
+
+    public void setTjzd(String tjzd) {
+        this.tjzd = tjzd;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getScxbsm() {
+        return scxbsm;
+    }
+
+    public void setScxbsm(String scxbsm) {
+        this.scxbsm = scxbsm;
+    }
+
+    public String getYsmc() {
+        return ysmc;
+    }
+
+    public void setYsmc(String ysmc) {
+        this.ysmc = ysmc;
+    }
+
+    public Double getZdmj() {
+        return zdmj;
+    }
+
+    public void setZdmj(Double zdmj) {
+        this.zdmj = zdmj;
+    }
+
+    public String getJcjg() {
+        return jcjg;
+    }
+
+    public void setJcjg(String jcjg) {
+        this.jcjg = jcjg;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxJcxsDTO.java

@@ -0,0 +1,81 @@
+package com.onemap.analyse.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//合规性分析 检查项实体
+public class HgxfxJcxsDTO {
+    private Integer kzxjb;
+    //结果图斑数据
+    private List<HgxfxGisDTO> jgs = new ArrayList<HgxfxGisDTO>();
+    private String  bsm;
+    private String rwbsm;
+    private String scxbsm;
+    private String ysmc;
+    private Double zdmj;
+    private String jcjg;
+
+    public Integer getKzxjb() {
+        return kzxjb;
+    }
+
+    public void setKzxjb(Integer kzxjb) {
+        this.kzxjb = kzxjb;
+    }
+
+    public List<HgxfxGisDTO> getJgs() {
+        return jgs;
+    }
+
+    public void setJgs(List<HgxfxGisDTO> jgs) {
+        this.jgs = jgs;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getScxbsm() {
+        return scxbsm;
+    }
+
+    public void setScxbsm(String scxbsm) {
+        this.scxbsm = scxbsm;
+    }
+
+    public String getYsmc() {
+        return ysmc;
+    }
+
+    public void setYsmc(String ysmc) {
+        this.ysmc = ysmc;
+    }
+
+    public Double getZdmj() {
+        return zdmj;
+    }
+
+    public void setZdmj(Double zdmj) {
+        this.zdmj = zdmj;
+    }
+
+    public String getJcjg() {
+        return jcjg;
+    }
+
+    public void setJcjg(String jcjg) {
+        this.jcjg = jcjg;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxScxDTO.java

@@ -0,0 +1,80 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+//合规性分析审查配置项表
+@TableName("t_fzss_hgxfx_scx")
+public class HgxfxScxDTO {
+    private String bsm;
+    private String ysdm;
+    private String ysmc;
+    private String sjy;
+    private Integer kzxjb;
+    private Integer xssx;
+    private String tjzd;
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getYsdm() {
+        return ysdm;
+    }
+
+    public void setYsdm(String ysdm) {
+        this.ysdm = ysdm;
+    }
+
+    public String getYsmc() {
+        return ysmc;
+    }
+
+    public void setYsmc(String ysmc) {
+        this.ysmc = ysmc;
+    }
+
+    public String getSjy() {
+        return sjy;
+    }
+
+    public void setSjy(String sjy) {
+        this.sjy = sjy;
+    }
+
+    public Integer getKzxjb() {
+        return kzxjb;
+    }
+
+    public void setKzxjb(Integer kzxjb) {
+        this.kzxjb = kzxjb;
+    }
+
+    public Integer getXssx() {
+        return xssx;
+    }
+
+    public void setXssx(Integer xssx) {
+        this.xssx = xssx;
+    }
+
+    public String getTjzd() {
+        return tjzd;
+    }
+
+    public void setTjzd(String tjzd) {
+        this.tjzd = tjzd;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/HgxfxTemplateDTO.java

@@ -0,0 +1,43 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("t_fzss_hgxfx_template")
+public class HgxfxTemplateDTO {
+    private String bsm;
+    private String mbmc;
+    private String fxyz;
+    private String bz;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMbmc() {
+        return mbmc;
+    }
+
+    public void setMbmc(String mbmc) {
+        this.mbmc = mbmc;
+    }
+
+    public String getFxyz() {
+        return fxyz;
+    }
+
+    public void setFxyz(String fxyz) {
+        this.fxyz = fxyz;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/RwztDTO.java

@@ -0,0 +1,37 @@
+package com.onemap.analyse.domain;
+
+/**
+ * 分析任务状态码
+ */
+public class RwztDTO {
+    private Integer None = -1;
+    private Integer Create = 0;
+    private Integer Run = 1;
+    private Integer Complete = 2;
+    private Integer Error = 3;
+    private Integer NoJX = 99;
+
+    public Integer getNone() {
+        return None;
+    }
+
+    public Integer getCreate() {
+        return Create;
+    }
+
+    public Integer getRun() {
+        return Run;
+    }
+
+    public Integer getComplete() {
+        return Complete;
+    }
+
+    public Integer getError() {
+        return Error;
+    }
+
+    public Integer getNoJX() {
+        return NoJX;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/TCtfxMainDTO.java

@@ -0,0 +1,179 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@TableName("t_fxpj_ctfx_main")
+public class TCtfxMainDTO {
+    private String id;
+    private String name;
+    private String sjy;
+    private String fxyz;
+    private String username;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
+    private String rwzt;
+    private String ssmk;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rwkssj;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rwjssj;
+    private String remark;
+    private String fxjg;
+    private String fxtable;
+    private String fxjgtable;
+    private String fxyear;
+    private String workspace;
+    private String xzqdm;
+    private String statist;
+
+    public String getStatist() {
+        return statist;
+    }
+
+    public void setStatist(String statist) {
+        this.statist = statist;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getWorkspace() {
+        return workspace;
+    }
+
+    public void setWorkspace(String workspace) {
+        this.workspace = workspace;
+    }
+
+    public String getFxtable() {
+        return fxtable;
+    }
+
+    public void setFxtable(String fxtable) {
+        this.fxtable = fxtable;
+    }
+
+    public String getFxjgtable() {
+        return fxjgtable;
+    }
+
+    public void setFxjgtable(String fxjgtable) {
+        this.fxjgtable = fxjgtable;
+    }
+
+    public String getFxyear() {
+        return fxyear;
+    }
+
+    public void setFxyear(String fxyear) {
+        this.fxyear = fxyear;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSjy() {
+        return sjy;
+    }
+
+    public void setSjy(String sjy) {
+        this.sjy = sjy;
+    }
+
+    public String getFxyz() {
+        return fxyz;
+    }
+
+    public void setFxyz(String fxyz) {
+        this.fxyz = fxyz;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(String rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public String getSsmk() {
+        return ssmk;
+    }
+
+    public void setSsmk(String ssmk) {
+        this.ssmk = ssmk;
+    }
+
+    public Date getRwkssj() {
+        return rwkssj;
+    }
+
+    public void setRwkssj(Date rwkssj) {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwjssj() {
+        return rwjssj;
+    }
+
+    public void setRwjssj(Date rwjssj) {
+        this.rwjssj = rwjssj;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getFxjg() {
+        return fxjg;
+    }
+
+    public void setFxjg(String fxjg) {
+        this.fxjg = fxjg;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/TCtfxTdkfqdDTO.java

@@ -0,0 +1,49 @@
+package com.onemap.analyse.domain;
+
+public class TCtfxTdkfqdDTO {
+    private String xzqdm;
+    private String xzqmc;
+    private Double tbmj ;
+    private Double xzqmj ;
+    private Double proportion ;
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public Double getTbmj() {
+        return tbmj;
+    }
+
+    public void setTbmj(Double tbmj) {
+        this.tbmj = tbmj;
+    }
+
+    public Double getXzqmj() {
+        return xzqmj;
+    }
+
+    public void setXzqmj(Double xzqmj) {
+        this.xzqmj = xzqmj;
+    }
+
+    public Double getProportion() {
+        return proportion;
+    }
+
+    public void setProportion(Double proportion) {
+        this.proportion = proportion;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/XzlbDTO.java

@@ -0,0 +1,22 @@
+package com.onemap.analyse.domain;
+
+public class XzlbDTO {
+    private Integer xmxz =0;
+    private Integer hgxfx = 1;
+
+    public Integer getXmxz() {
+        return xmxz;
+    }
+
+    public void setXmxz(Integer xmxz) {
+        this.xmxz = xmxz;
+    }
+
+    public Integer getHgxfx() {
+        return hgxfx;
+    }
+
+    public void setHgxfx(Integer hgxfx) {
+        this.hgxfx = hgxfx;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ZttDTO.java

@@ -0,0 +1,154 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("t_yzt_ztt")
+public class ZttDTO {
+    private String bsm;
+    private String mbbsm;
+    private String zbt;
+    private String fbt;
+    private String bzdw;
+    private String bzsj;
+    private String ztsj;
+    private String ztdw;
+    private Integer ztzt;
+    private String zttwj;
+    private Date kssj;
+    private Date jssj;
+    private String cjyh;
+    private Date cjsj;
+    private String bz;
+    private String xzqdm;
+
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMbbsm() {
+        return mbbsm;
+    }
+
+    public void setMbbsm(String mbbsm) {
+        this.mbbsm = mbbsm;
+    }
+
+    public String getZbt() {
+        return zbt;
+    }
+
+    public void setZbt(String zbt) {
+        this.zbt = zbt;
+    }
+
+    public String getFbt() {
+        return fbt;
+    }
+
+    public void setFbt(String fbt) {
+        this.fbt = fbt;
+    }
+
+    public String getBzdw() {
+        return bzdw;
+    }
+
+    public void setBzdw(String bzdw) {
+        this.bzdw = bzdw;
+    }
+
+    public String getBzsj() {
+        return bzsj;
+    }
+
+    public void setBzsj(String bzsj) {
+        this.bzsj = bzsj;
+    }
+
+    public String getZtsj() {
+        return ztsj;
+    }
+
+    public void setZtsj(String ztsj) {
+        this.ztsj = ztsj;
+    }
+
+    public String getZtdw() {
+        return ztdw;
+    }
+
+    public void setZtdw(String ztdw) {
+        this.ztdw = ztdw;
+    }
+
+    public Integer getZtzt() {
+        return ztzt;
+    }
+
+    public void setZtzt(Integer ztzt) {
+        this.ztzt = ztzt;
+    }
+
+    public String getZttwj() {
+        return zttwj;
+    }
+
+    public void setZttwj(String zttwj) {
+        this.zttwj = zttwj;
+    }
+
+    public Date getKssj() {
+        return kssj;
+    }
+
+    public void setKssj(Date kssj) {
+        this.kssj = kssj;
+    }
+
+    public Date getJssj() {
+        return jssj;
+    }
+
+    public void setJssj(Date jssj) {
+        this.jssj = jssj;
+    }
+
+    public String getCjyh() {
+        return cjyh;
+    }
+
+    public void setCjyh(String cjyh) {
+        this.cjyh = cjyh;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/ZttMbDTO.java

@@ -0,0 +1,61 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("t_yzt_zttmb")
+public class ZttMbDTO {
+    private String bsm;
+    private String fzbsm;
+    private String mbmc;
+    private String mbwj;
+    private String mbms;
+    private Integer zt;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getFzbsm() {
+        return fzbsm;
+    }
+
+    public void setFzbsm(String fzbsm) {
+        this.fzbsm = fzbsm;
+    }
+
+    public String getMbmc() {
+        return mbmc;
+    }
+
+    public void setMbmc(String mbmc) {
+        this.mbmc = mbmc;
+    }
+
+    public String getMbwj() {
+        return mbwj;
+    }
+
+    public void setMbwj(String mbwj) {
+        this.mbwj = mbwj;
+    }
+
+    public String getMbms() {
+        return mbms;
+    }
+
+    public void setMbms(String mbms) {
+        this.mbms = mbms;
+    }
+
+    public Integer getZt() {
+        return zt;
+    }
+
+    public void setZt(Integer zt) {
+        this.zt = zt;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/zbmx/ZbmxMxjsDTO.java

@@ -0,0 +1,69 @@
+package com.onemap.analyse.domain.zbmx;
+
+public class ZbmxMxjsDTO {
+
+    /**
+     * 标识码
+     */
+    private String bsm;
+
+    /**
+     * 模型标识
+     */
+    private String mxbsm;
+
+    /**
+     * 模型名称
+     */
+    private String mxmc;
+
+    /**
+     * 模型参数
+     */
+    private String mxcs;
+
+    /**
+     * 指标编号
+     */
+    private String zbbh;
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMxbsm() {
+        return mxbsm;
+    }
+
+    public void setMxbsm(String mxbsm) {
+        this.mxbsm = mxbsm;
+    }
+
+    public String getMxmc() {
+        return mxmc;
+    }
+
+    public void setMxmc(String mxmc) {
+        this.mxmc = mxmc;
+    }
+
+    public String getMxcs() {
+        return mxcs;
+    }
+
+    public void setMxcs(String mxcs) {
+        this.mxcs = mxcs;
+    }
+
+    public String getZbbh() {
+        return zbbh;
+    }
+
+    public void setZbbh(String zbbh) {
+        this.zbbh = zbbh;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/zbmx/ZbmxMxjsrwDO.java

@@ -0,0 +1,220 @@
+package com.onemap.analyse.domain.zbmx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@TableName("T_ZBMX_MXJSRW")
+public class ZbmxMxjsrwDO {
+
+    /**
+     * 标识码
+     */
+
+    private String bsm;
+
+    /**
+     * 模型标识
+     */
+    private String mxbsm;
+
+    /**
+     * 模型名称
+     */
+    private String mxmc;
+
+    /**
+     * 模型作业标识
+     */
+    private String mxzybsm;
+
+    /**
+     * 任务状态(0创建 1执行中 2完成 3错误)
+     */
+    private Integer rwzt;
+
+    /**
+     * 任务开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rwkssj;
+
+    /**
+     * 任务结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rwjssj;
+
+    /**
+     * 创建方式(0自动 1手动)
+     */
+    private Integer cjfs;
+
+    /**
+     * 创建用户
+     */
+    private String cjyh;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
+
+    /**
+     * 结果值
+     */
+    private Double jgz;
+
+    /**
+     * 结果数据
+     */
+    private String jgsj;
+
+    public ZbmxMxjsrwDO() {
+    }
+
+    public ZbmxMxjsrwDO(String bsm, String cjyh, Integer cjfs, String mxbsm, String mxmc) {
+        this.bsm = bsm;
+        this.mxbsm = mxbsm;
+        this.mxmc = mxmc;
+        this.cjfs = cjfs;
+        this.cjyh = cjyh;
+    }
+
+    public ZbmxMxjsrwDO(String bsm, String mxbsm, String mxmc, String mxzybsm, Integer rwzt,
+                        Date rwkssj, Date rwjssj, Integer cjfs, String cjyh, Date cjsj,
+                        Double jgz, String jgsj) {
+        this.bsm = bsm;
+        this.mxbsm = mxbsm;
+        this.mxmc = mxmc;
+        this.mxzybsm = mxzybsm;
+        this.rwzt = rwzt;
+        this.rwkssj = rwkssj;
+        this.rwjssj = rwjssj;
+        this.cjfs = cjfs;
+        this.cjyh = cjyh;
+        this.cjsj = cjsj;
+        this.jgz = jgz;
+        this.jgsj = jgsj;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMxbsm() {
+        return mxbsm;
+    }
+
+    public void setMxbsm(String mxbsm) {
+        this.mxbsm = mxbsm;
+    }
+
+    public String getMxmc() {
+        return mxmc;
+    }
+
+    public void setMxmc(String mxmc) {
+        this.mxmc = mxmc;
+    }
+
+    public String getMxzybsm() {
+        return mxzybsm;
+    }
+
+    public void setMxzybsm(String mxzybsm) {
+        this.mxzybsm = mxzybsm;
+    }
+
+    public Integer getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(Integer rwzt) {
+        this.rwzt = rwzt;
+    }
+
+    public Date getRwkssj() {
+        return rwkssj;
+    }
+
+    public void setRwkssj(Date rwkssj) {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwjssj() {
+        return rwjssj;
+    }
+
+    public void setRwjssj(Date rwjssj) {
+        this.rwjssj = rwjssj;
+    }
+
+    public Integer getCjfs() {
+        return cjfs;
+    }
+
+    public void setCjfs(Integer cjfs) {
+        this.cjfs = cjfs;
+    }
+
+    public String getCjyh() {
+        return cjyh;
+    }
+
+    public void setCjyh(String cjyh) {
+        this.cjyh = cjyh;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public Double getJgz() {
+        return jgz;
+    }
+
+    public void setJgz(Double jgz) {
+        this.jgz = jgz;
+    }
+
+    public String getJgsj() {
+        return jgsj;
+    }
+
+    public void setJgsj(String jgsj) {
+        this.jgsj = jgsj;
+    }
+
+    @Override
+    public String toString() {
+        return "ZbmxMxjsrwDO{" +
+            "bsm='" + bsm + '\'' +
+            ", mxbsm='" + mxbsm + '\'' +
+            ", mxmc='" + mxmc + '\'' +
+            ", mxzybsm='" + mxzybsm + '\'' +
+            ", rwzt=" + rwzt +
+            ", rwkssj=" + rwkssj +
+            ", rwjssj=" + rwjssj +
+            ", cjfs=" + cjfs +
+            ", cjyh='" + cjyh + '\'' +
+            ", cjsj=" + cjsj +
+            ", jgz=" + jgz +
+            ", jgsj='" + jgsj + '\'' +
+            '}';
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/zbmx/ZbmxMxjsrwrzDO.java

@@ -0,0 +1,126 @@
+package com.onemap.analyse.domain.zbmx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("T_ZBMX_MXJSRWRZ")
+public class ZbmxMxjsrwrzDO {
+
+    /**
+     * 模型标识
+     */
+    private String bsm;
+
+    /**
+     * 模型标识
+     */
+    private String mxbsm;
+
+    /**
+     * 模型名称
+     */
+    private String mxmc;
+
+    /**
+     * 任务标识码
+     */
+    private String rwbsm;
+
+    /**
+     * 日志类型(Info,warning,error)
+     */
+    private String rzlx;
+
+    /**
+     * 日志时间
+     */
+    private Date rzsj;
+
+    /**
+     * 日志内容
+     */
+    private String rzlr;
+
+    public ZbmxMxjsrwrzDO() {
+    }
+
+    public ZbmxMxjsrwrzDO(String bsm, String mxbsm, String mxmc, String rwbsm, String rzlx, Date rzsj, String rzlr) {
+        this.bsm = bsm;
+        this.mxbsm = mxbsm;
+        this.mxmc = mxmc;
+        this.rwbsm = rwbsm;
+        this.rzlx = rzlx;
+        this.rzsj = rzsj;
+        this.rzlr = rzlr;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getMxbsm() {
+        return mxbsm;
+    }
+
+    public void setMxbsm(String mxbsm) {
+        this.mxbsm = mxbsm;
+    }
+
+    public String getMxmc() {
+        return mxmc;
+    }
+
+    public void setMxmc(String mxmc) {
+        this.mxmc = mxmc;
+    }
+
+    public String getRwbsm() {
+        return rwbsm;
+    }
+
+    public void setRwbsm(String rwbsm) {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getRzlx() {
+        return rzlx;
+    }
+
+    public void setRzlx(String rzlx) {
+        this.rzlx = rzlx;
+    }
+
+    public Date getRzsj() {
+        return rzsj;
+    }
+
+    public void setRzsj(Date rzsj) {
+        this.rzsj = rzsj;
+    }
+
+    public String getRzlr() {
+        return rzlr;
+    }
+
+    public void setRzlr(String rzlr) {
+        this.rzlr = rzlr;
+    }
+
+    @Override
+    public String toString() {
+        return "ZbmxMxjsrwrzDO{" +
+            "bsm='" + bsm + '\'' +
+            ", mxbsm='" + mxbsm + '\'' +
+            ", mxmc='" + mxmc + '\'' +
+            ", rwbsm='" + rwbsm + '\'' +
+            ", rzlx='" + rzlx + '\'' +
+            ", rzsj=" + rzsj +
+            ", rzlr='" + rzlr + '\'' +
+            '}';
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/CtfxMapper.java

@@ -0,0 +1,18 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.TCtfxMainDTO;
+import com.onemap.analyse.domain.TCtfxTdkfqdDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 冲突分析 数据层
+ *
+ * @author onemap
+ */
+public interface CtfxMapper extends BaseMapper<TCtfxMainDTO> {
+
+    List<TCtfxTdkfqdDTO> Tdkfqd(@Param("tablename") String tablename, @Param("xzqdm") String xzqdm, @Param("curlevel") int curlevel, @Param("sublevel") int sublevel);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FxrwrzMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FxrwrzDTO;
+import com.onemap.analyse.domain.ZttDTO;
+
+/**
+ * 专题图 数据层
+ *
+ * @author onemap
+ */
+public interface FxrwrzMapper extends BaseMapper<FxrwrzDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzssChscFileMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzssChscFileDTO;
+
+
+/**
+ * 辅助实施  数据层
+ *
+ * @author onemap
+ */
+public interface FzssChscFileMapper extends BaseMapper<FzssChscFileDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzssChscMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzChscDTO;
+
+
+/**
+ * 辅助实施  数据层
+ *
+ * @author onemap
+ */
+public interface FzssChscMapper extends BaseMapper<FzxzChscDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzssSystemMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzssSystemDTO;
+
+
+/**
+ * 辅助实施  系统对接 数据层
+ *
+ * @author onemap
+ */
+public interface FzssSystemMapper extends BaseMapper<FzssSystemDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzJgGISMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.FzxzJgGisDTO;
+
+/**
+ * 辅助选址 数据层
+ *
+ * @author onemap
+ */
+public interface FzxzJgGISMapper extends BaseMapper<FzxzJgGisDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzJgyzMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzJgyzDTO;
+
+/**
+ * 辅助选址 数据层
+ *
+ * @author onemap
+ */
+public interface FzxzJgyzMapper extends BaseMapper<FzxzJgyzDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzMapper.java

@@ -0,0 +1,18 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.FzxzEntityDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 辅助选址 数据层
+ *
+ * @author onemap
+ */
+public interface FzxzMapper extends BaseMapper<FzxzDTO> {
+    List<FzxzEntityDTO> GetFzxzList(@Param("xmmc") String xmmc, @Param("kssj") String kssj, @Param("jssj") String jssj);
+    FzxzEntityDTO GetFzxzByBsm(@Param("bsm") String bsm);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzTbMapper.java

@@ -0,0 +1,17 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.FzxzEntityDTO;
+import com.onemap.analyse.domain.FzxzTbEntityDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 辅助选址图斑
+ *
+ * @author onemap
+ */
+public interface FzxzTbMapper extends BaseMapper<FzxzTbEntityDTO> {
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzXzyzMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.FzxzXzyzDTO;
+
+/**
+ * 辅助选址 数据层
+ *
+ * @author onemap
+ */
+public interface FzxzXzyzMapper extends BaseMapper<FzxzXzyzDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/HgxfxHgscxMapper.java

@@ -0,0 +1,18 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.HgxfxHgscxDTO;
+import com.onemap.analyse.domain.HgxfxHgscxExportDTO;
+import com.onemap.analyse.domain.HgxfxScxDTO;
+
+import java.util.List;
+
+/**
+ * 合规性分析数据层
+ *
+ * @author onemap
+ */
+public interface HgxfxHgscxMapper extends BaseMapper<HgxfxHgscxDTO> {
+
+    List<HgxfxHgscxExportDTO> queryScxList(String rwbsm);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/HgxfxMapper.java

@@ -0,0 +1,22 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.HgxfxDTO;
+import com.onemap.analyse.domain.HgxfxFxtbDTO;
+import com.onemap.analyse.domain.HgxfxJcxsDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 合规性分析 数据层
+ *
+ * @author onemap
+ */
+public interface HgxfxMapper extends BaseMapper<HgxfxDTO> {
+    List<HgxfxDTO> GetPage(@Param("kssj") String kssj, @Param("jssj") String jssj, @Param("xmmc") String xmmc);
+
+    List<HgxfxJcxsDTO> getJcxs(String bsm);
+
+    List<HgxfxFxtbDTO> getFxtb(String bsm);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/HgxfxScxMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.HgxfxScxDTO;
+
+/**
+ * 合规性分析数据层
+ *
+ * @author onemap
+ */
+public interface HgxfxScxMapper extends BaseMapper<HgxfxScxDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/HgxfxTemplateMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.HgxfxTemplateDTO;
+
+/**
+ * 合规性分析  模板 数据层
+ *
+ * @author onemap
+ */
+public interface HgxfxTemplateMapper extends BaseMapper<HgxfxTemplateDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/ZttMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.ZttDTO;
+
+/**
+ * 专题图 数据层
+ *
+ * @author onemap
+ */
+public interface ZttMapper extends BaseMapper<ZttDTO> {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/ZttMbMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.analyse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.ZttMbDTO;
+
+/**
+ * 专题图 数据层
+ *
+ * @author onemap
+ */
+public interface ZttMbMapper extends BaseMapper<ZttMbDTO>
+{
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/zbmx/ZbmxMxjsrwMapper.java

@@ -0,0 +1,20 @@
+package com.onemap.analyse.mapper.zbmx;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.zbmx.ZbmxMxjsDTO;
+import com.onemap.analyse.domain.zbmx.ZbmxMxjsrwDO;
+import com.onemap.system.api.domain.SysUser;
+
+import java.util.List;
+
+public interface ZbmxMxjsrwMapper extends BaseMapper<ZbmxMxjsrwDO> {
+
+    /**
+     * 查询待计算的任务
+     */
+    List<ZbmxMxjsDTO> selectNewTask();
+    /**
+     * 修改任务信息
+     */
+    public int updateZbmxMxjsrwById(ZbmxMxjsrwDO zbmxMxjsrwDO);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/zbmx/ZbmxMxjsrwrzMapper.java

@@ -0,0 +1,7 @@
+package com.onemap.analyse.mapper.zbmx;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.analyse.domain.zbmx.ZbmxMxjsrwrzDO;
+
+public interface ZbmxMxjsrwrzMapper extends BaseMapper<ZbmxMxjsrwrzDO> {
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IChscService.java

@@ -0,0 +1,25 @@
+package com.onemap.analyse.service;
+
+import com.onemap.analyse.domain.FzssChscXmgxDTO;
+import com.onemap.analyse.domain.FzxzChscDTO;
+import com.onemap.common.core.domain.R;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.core.web.domain.WebResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface IChscService {
+    R<?> authorize(String appid, HttpServletRequest request, HttpServletResponse response);
+
+    WebResult download(String bsm, HttpServletRequest request, HttpServletResponse response);
+
+    WebResult getProgress(String bsm, HttpServletRequest request, HttpServletResponse response);
+
+    WebResult xmjg(FzssChscXmgxDTO fzssChscXmgxDTO);
+
+    WebResult create(FzxzChscDTO fzxzChscDTO);
+
+    WebResult txt2shp(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IFzssService.java

@@ -0,0 +1,18 @@
+package com.onemap.analyse.service;
+
+import com.onemap.analyse.domain.HgxfxEntityDTO;
+import com.onemap.common.core.web.domain.RequestResult;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
+
+public interface IFzssService {
+    RequestResult AddHgxfx(HgxfxEntityDTO hgxfxEntityDTO) throws IOException;
+
+    RequestResult AddFzxz(Map params);
+
+    RequestResult GetXzjg(String bsm);
+
+    RequestResult saveWordFile(String bsm, ArrayList xzbsm);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IToolService.java

@@ -0,0 +1,8 @@
+package com.onemap.analyse.service;
+
+import com.onemap.common.core.web.domain.WebResult;
+
+public interface IToolService {
+
+    WebResult jsonToShp(String esrijson);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ChscServiceImpl.java

@@ -0,0 +1,236 @@
+package com.onemap.analyse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.analyse.task.PythonExecute;
+import com.onemap.analyse.utils.DownloadUtils;
+import com.onemap.analyse.utils.EsriJsonUtils;
+import com.onemap.analyse.utils.FileUtils;
+import com.onemap.analyse.utils.HttpUtil;
+import com.onemap.analyse.domain.*;
+import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.service.IChscService;
+import com.onemap.common.core.domain.R;
+import com.onemap.common.core.utils.FileStreamUtils;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.utils.ZipUtils;
+import com.onemap.common.core.web.domain.WebResult;
+import com.onemap.system.api.RemoteAuthService;
+import org.python.modules._marshal;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.nio.file.Paths;
+import java.util.*;
+
+@Service
+public class ChscServiceImpl implements IChscService {
+
+    @Autowired
+    private RemoteAuthService remoteAuthService;
+    @Autowired
+    private FzssSystemMapper fzssSystemMapper;
+    @Resource
+    private FzssChscMapper fzssChscMapper;
+    @Resource
+    private HgxfxMapper hgxfxMapper;
+    @Resource
+    private FzxzMapper fzxzMapper;
+    @Resource
+    private FzssChscFileMapper fzssChscFileMapper;
+    private RwztDTO rwztDTO = new RwztDTO();
+    private XzlbDTO xzlbDTO = new XzlbDTO();
+    private FxfwDictDTO fxfwDictDTO = new FxfwDictDTO();
+    @Value("${Hgxfx.temp}")
+    private String temp;
+
+    @Override
+    public R<?> authorize(String appid, HttpServletRequest request, HttpServletResponse response) {
+        QueryWrapper<FzssSystemDTO> wrapper = new QueryWrapper<>();
+        wrapper.eq("id", appid);
+        FzssSystemDTO system = fzssSystemMapper.selectOne(wrapper);
+        if (system != null) {
+            String requestIp = HttpUtil.getRequestIp(request);
+            if (!system.getIp().contains(requestIp)) {
+                return R.fail(500, "访问ip与申请ip不一致");
+            }
+            R<?> r = remoteAuthService.empoweruser(system.getUsername());
+            return r;
+        }
+        return R.fail(500, "未检索到appid相关信息");
+    }
+
+    @Override
+    public WebResult download(String bsm, HttpServletRequest request, HttpServletResponse response) {
+        QueryWrapper<FzxzChscDTO> wrapper = new QueryWrapper<>();
+        wrapper.eq("bsm", bsm);
+        FzxzChscDTO chsc = fzssChscMapper.selectOne(wrapper);
+        if (chsc != null && rwztDTO.getComplete().equals(chsc.getRwzt())) {
+            //选址类别（0意向范围筛选，1指定空间位置）
+            if (xzlbDTO.getHgxfx() == chsc.getXzlb()) {
+                HgxfxDTO hgxfx = hgxfxMapper.selectOne(new QueryWrapper<HgxfxDTO>().eq("bsm", bsm));
+                if (hgxfx != null) {
+                    DownloadUtils.download(response, hgxfx.getFxbg().replace(".docx", ".pdf"), "选址报告");
+                    return null;
+                } else {
+                    return WebResult.error("查询报告为空");
+                }
+            } else if (xzlbDTO.getXmxz() == chsc.getXzlb()) {
+                FzxzDTO fzxz = fzxzMapper.selectOne(new QueryWrapper<FzxzDTO>().eq("bsm", bsm));
+                if (fzxz != null) {
+                    DownloadUtils.download(response, fzxz.getFxbg(), "选址报告");
+                    return null;
+                } else {
+                    return WebResult.error("查询报告为空");
+                }
+            }
+            return WebResult.error("查询报告为空");
+        }
+        return WebResult.error("项目不存在或分析未完成");
+    }
+
+    @Override
+    public WebResult getProgress(String bsm, HttpServletRequest request, HttpServletResponse response) {
+        QueryWrapper<FzxzChscDTO> wrapper = new QueryWrapper<>();
+        wrapper.eq("bsm", bsm);
+        FzxzChscDTO chsc = fzssChscMapper.selectOne(wrapper);
+        if (chsc != null) {
+            FzxzChscProgressDTO res = new FzxzChscProgressDTO();
+            res.setBsm(chsc.getBsm());
+            res.setJd(chsc.getRwjd());
+            res.setMsg(chsc.getRwzt() == rwztDTO.getNoJX() ? "未解析" : chsc.getRwjg());
+            res.setState(chsc.getRwzt());
+            return WebResult.success("操作成功", res);
+        } else {
+            return WebResult.error("项目不存在");
+        }
+    }
+
+    @Override
+    public WebResult xmjg(FzssChscXmgxDTO fzssChscXmgxDTO) {
+        QueryWrapper<FzxzChscDTO> wrapper = new QueryWrapper<>();
+        wrapper.eq("bsm", fzssChscXmgxDTO.getBsm());
+        FzxzChscDTO chsc = fzssChscMapper.selectOne(wrapper);
+        if (chsc != null) {
+            chsc.setChzt(String.valueOf(fzssChscXmgxDTO.getChzt()));
+            chsc.setChjg(fzssChscXmgxDTO.getChjg());
+            chsc.setChbz(fzssChscXmgxDTO.getChjg());
+            try {
+                fzssChscMapper.update(chsc, wrapper);
+                return WebResult.success("操作成功", true);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return WebResult.error("数据更新失败");
+        }
+        return WebResult.error("项目编码错误");
+    }
+
+    @Override
+    public WebResult create(FzxzChscDTO fzxzChscDTO) {
+        if (!fzxzChscDTO.paramsChecked()) {
+            return WebResult.error("必输入参数不能为空");
+        }
+        if (fzxzChscDTO.getFwlx() == fxfwDictDTO.getShp()) {
+            FzssChscFileDTO fileDTO = fzssChscFileMapper.selectOne(new QueryWrapper<FzssChscFileDTO>().eq("bsm", fzxzChscDTO.getXzfw()));
+            if (fileDTO == null) {
+                return WebResult.error("选址范围错误，请检查参数是否正确");
+            }
+            if (!FileUtils.check(fileDTO.getWj())) {
+                return WebResult.error("选址范围未找到，请重新上传范围文件");
+            }
+        } else {
+            return WebResult.error("FWLX暂不支持" + fzxzChscDTO.getFwlx());
+        }
+        //插入策划生成数据库表
+        String uuid = StringUtils.getUUID();
+        fzxzChscDTO.setBsm(uuid);
+        fzxzChscDTO.setRwzt(rwztDTO.getNoJX());
+        fzxzChscDTO.setCjsj(new Date());
+        fzssChscMapper.insert(fzxzChscDTO);
+        return WebResult.success("操作成功", uuid);
+    }
+
+    @Override
+    public WebResult txt2shp(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+        //将txt文件保存到本地
+        long timeMillis = System.currentTimeMillis();
+        String targetfolder = temp + "\\" + timeMillis + "\\";
+        String targetfile = targetfolder + file.getOriginalFilename();
+        String jsonpath = targetfolder + "esrijson.json";
+        String shppath = targetfolder + "shape.shp";
+        try {
+            FileUtils.makedir(targetfolder);
+            file.transferTo(Paths.get(targetfile));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<String> strlist = new ArrayList<>();
+        BufferedReader br = null;
+        try {
+            br = new BufferedReader(new InputStreamReader(new FileInputStream(new File(targetfile)), "UTF-8"));//GBK
+            String str = null;
+            int i = 0;
+            while ((str = br.readLine()) != null) {
+                if (!StringUtils.isEmpty(str) && !str.startsWith("#")) {
+                    strlist.add(str);
+                }
+                i++;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                br.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //将文本字符串进行转换，生成esrijson并保存到本地
+        String esrijson = EsriJsonUtils.arrayToJson(strlist);
+        //写入文件
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(jsonpath, true);
+            //true表示在文件末尾追加
+            fos.write(esrijson.toString().getBytes());
+            fos.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            //调用Python执行esrijson转shp
+            String msg = PythonExecute.EsriJson2shp(jsonpath, shppath);
+            if (!StringUtils.isEmpty(msg) && msg.contains("OK")) {
+                //将shp相关文件进行压缩并输入
+                List<Map> fileList = new ArrayList<>();
+                Map map = new HashMap();
+                map.put("fileName", FileStreamUtils.getFileName(shppath));
+                map.put("outByte", FileStreamUtils.getByteArrayOutputStream(shppath).toByteArray());
+                fileList.add(map);
+                String[] kzm = {".sbn",".shx", ".dbf", ".cpg", ".prj"};
+                String curkzm = ".shp";
+                for (int i = 0; i < kzm.length; i++) {
+                    String curpath = shppath.replaceAll(curkzm, kzm[i]);
+                    Map cur = new HashMap();
+                    cur.put("fileName", FileStreamUtils.getFileName(curpath));
+                    cur.put("outByte", FileStreamUtils.getByteArrayOutputStream(curpath).toByteArray());
+                    fileList.add(cur);
+                }
+                ZipUtils.zipFiles(fileList,response);
+            } else {
+                WebResult.error("json转shape失败", false);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        //当初当前临时文件夹
+        FileUtils.deldir(targetfolder);
+        return null;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -0,0 +1,180 @@
+package com.onemap.analyse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.analyse.domain.*;
+import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.service.IFzssService;
+import com.onemap.analyse.task.FzxzPlanSchedule;
+import com.onemap.analyse.task.FzxzSchedule;
+import com.onemap.analyse.utils.DozerUtils;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static com.onemap.analyse.utils.Fxfw2SdeUtils.vector2Sde;
+
+@Service
+public class FzssServiceImpl implements IFzssService {
+    private FxfwDictDTO fxfwDictDTO = new FxfwDictDTO();
+    @Value("${Hgxfx.temp}")
+    private String temp;
+    //任务状态标识码
+    private RwztDTO Rwzt = new RwztDTO();
+    //shp入库的方法标识码
+    private String shpPyFun = "shp2sde";
+    //esrijson入库的方法标识码
+    private String esrijsonPyFun = "esriJson2sde";
+    @Autowired
+    private HgxfxScxMapper hgxfxScxMapper;
+    @Autowired
+    private HgxfxHgscxMapper hgxfxHgscxMapper;
+    @Autowired
+    private HgxfxMapper hgxfxMapper;
+    @Autowired
+    private FzxzMapper fzxzMapper;
+    @Autowired
+    private FzxzXzyzMapper fzxzXzyzMapper;
+    @Autowired
+    private FzxzJgGISMapper fzxzJgGISMapper;
+    @Autowired
+    private FzxzJgyzMapper fzxzJgyzMapper;
+    @Autowired
+    FzxzSchedule fzxzSchedule;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public RequestResult AddHgxfx(HgxfxEntityDTO hgxfxEntityDTO) throws IOException {
+        HgxfxDTO requestHgxfxDTO = DozerUtils.map(hgxfxEntityDTO, HgxfxDTO.class);
+        requestHgxfxDTO.setFxmj(hgxfxEntityDTO.getXzmj());
+        requestHgxfxDTO.setRwly("Web");
+        requestHgxfxDTO.setRwzt(0);
+        requestHgxfxDTO.setCjsj(new Date());
+        requestHgxfxDTO.setBsm(StringUtils.getUUID());
+        requestHgxfxDTO.setCjyh(SecurityUtils.getUsername());
+        //将分析范围矢量数据插入到KJGH.T_FZSS_FXRW_GIS
+        RequestResult info = vector2Sde(hgxfxEntityDTO, requestHgxfxDTO);
+        if (info != null) {
+            return info;
+        }
+        //查询审查项 默认把控制线级别等于0的也添加进去
+        QueryWrapper<HgxfxScxDTO> wrapper = new QueryWrapper<HgxfxScxDTO>();
+        wrapper.eq("kzxjb", 0).or().in("bsm", hgxfxEntityDTO.getScxs().split(",")).orderByAsc("xssx");
+        List<HgxfxScxDTO> res = hgxfxScxMapper.selectList(wrapper);
+        if (res.size() > 0) {
+            //插入审查项列表
+            for (HgxfxScxDTO cur : res) {
+                HgxfxHgscxDTO scx = new HgxfxHgscxDTO();
+                scx.setBsm(StringUtils.getUUID());
+                scx.setRwbsm(requestHgxfxDTO.getBsm());
+                scx.setScxbsm(cur.getBsm());
+                scx.setYsmc(cur.getYsmc());
+                hgxfxHgscxMapper.insert(scx);
+            }
+        }
+        //插入合规性检查表 并返回任务标识码
+        hgxfxMapper.insert(requestHgxfxDTO);
+        return RequestResult.success("保存成功！", requestHgxfxDTO.getBsm());
+    }
+
+    /**
+     * 新建辅助选址任务
+     *
+     * @param params
+     * @return
+     * @throws IOException
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public RequestResult AddFzxz(Map params) {
+        try {
+            //辅助选址
+            FzxzDTO fzxzDTO = DozerUtils.map(params, FzxzDTO.class);
+            fzxzDTO.setBsm(StringUtils.getUUID());
+            fzxzDTO.setCjsj(new Date());
+            fzxzDTO.setYdxz_bsm(fzxzDTO.getYdxz_bsm().replaceAll("\\[", "").replaceAll("\\]", ""));
+            ////将分析范围矢量数据插入到KJGH.T_FZSS_FXRW_GIS
+            //RequestResult info = fzxzvector2Sde(fzxzDTO, null);
+            //if (info != null) {
+            //    return info;
+            //}
+
+            //选址因子
+            ArrayList xzyx = (ArrayList) params.get("yxyz");
+            List<FzxzXzyzDTO> xzyxList = new ArrayList<>();
+            for (int i = 0; i < xzyx.size(); i++) {
+                FzxzXzyzDTO dto = DozerUtils.map(xzyx.get(i), FzxzXzyzDTO.class);
+                dto.setBsm(StringUtils.getUUID());
+                dto.setRwbsm(fzxzDTO.getBsm());
+                fzxzXzyzMapper.insert(dto);
+
+                xzyxList.add(dto);
+            }
+
+            //存储规划任务
+            String xzfw = fzxzDTO.getXzfw();
+            //TODO：需要判断
+            //if (fzxzDTO.getFwlx() == 1) {
+            // 绘制不需要存储空间数据
+            fzxzDTO.setXzfw("");
+            //}
+            fzxzDTO.setRwzt(Rwzt.getCreate());
+            fzxzDTO.setCjyh(SecurityUtils.getUsername());
+            fzxzMapper.insert(fzxzDTO);
+
+            //开始选址规划
+            fzxzDTO.setXzfw(xzfw);
+            FzxzPlanSchedule.startPlan(fzxzDTO, xzyxList);
+
+            return RequestResult.success("保存成功！", fzxzDTO.getBsm());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.success("保存失败！", 0);
+        }
+    }
+
+    @Override
+    public RequestResult GetXzjg(String bsm) {
+        if (StringUtils.isEmpty(bsm)) {
+            return RequestResult.error("标识码参数未传递！", null);
+        }
+        //查询辅助选址基本信息
+        QueryWrapper<FzxzDTO> fzxzwrapper = new QueryWrapper<FzxzDTO>();
+        fzxzwrapper.eq("bsm", bsm);
+        FzxzDTO fzxzinfo = fzxzMapper.selectOne(fzxzwrapper);
+        if (fzxzinfo == null) {
+            return RequestResult.error("辅助选址记录查为未空！", null);
+        }
+        FzxzResultDTO result = DozerUtils.map(fzxzinfo, FzxzResultDTO.class);
+        //查询分析结果图斑信息
+        QueryWrapper<FzxzJgGisDTO> giswrapper = new QueryWrapper<FzxzJgGisDTO>();
+        giswrapper.eq("rwbsm", result.getBsm());
+        List<FzxzJgGisDTO> gisinfo = fzxzJgGISMapper.selectList(giswrapper);
+        if (gisinfo.size() > 0) {
+            for (FzxzJgGisDTO gisDto : gisinfo) {
+                //查询分析因子结果信息
+                QueryWrapper<FzxzJgyzDTO> jgyzwrapper = new QueryWrapper<FzxzJgyzDTO>();
+                jgyzwrapper.eq("jbbsm", gisDto.getBsm()).eq("yztj", "F");
+                List<FzxzJgyzDTO> jgyzinfo = fzxzJgyzMapper.selectList(jgyzwrapper);
+                gisDto.setFxyzjg(jgyzinfo);
+            }
+        }
+        result.setItems(gisinfo);
+        return RequestResult.success("查询成功！", result);
+    }
+
+    @Override
+    public RequestResult saveWordFile(String bsm, ArrayList xzbsm) {
+        FzxzReport fzxzReport = fzxzSchedule.createReport(bsm, xzbsm);
+        return RequestResult.success(fzxzReport);
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ToolServiceImpl.java

@@ -0,0 +1,56 @@
+package com.onemap.analyse.service.impl;
+
+import com.onemap.analyse.service.IToolService;
+import com.onemap.analyse.task.PythonExecute;
+import com.onemap.analyse.utils.FileUtils;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.WebResult;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Paths;
+
+
+@Service
+public class ToolServiceImpl implements IToolService {
+
+    @Value("${Hgxfx.temp}")
+    private String temp;
+
+
+    @Override
+    public WebResult jsonToShp(String esrijson) {
+        if(StringUtils.isEmpty(esrijson)){
+            return WebResult.error("esrijson参数未传递！");
+        }
+        //将esrijson文件保存到本地
+        long timeMillis = System.currentTimeMillis();
+        String targetfolder = temp + "\\" + timeMillis + "\\";
+        String jsonpath = targetfolder + "esrijson.json";
+        String shppath = targetfolder + "shape.shp";
+        try {
+            FileUtils.makedir(targetfolder);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //写入文件
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(jsonpath, true);
+            //true表示在文件末尾追加
+            fos.write(esrijson.toString().getBytes());
+            fos.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        //调用Python执行esrijson转shp
+        String msg = PythonExecute.EsriJson2shp(jsonpath, shppath);
+        if (!StringUtils.isEmpty(msg) && msg.contains("OK")) {
+            return WebResult.success("转换成功！", shppath);
+        } else {
+            return WebResult.error("转换失败！");
+        }
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/ChscSchedule.java

@@ -0,0 +1,172 @@
+package com.onemap.analyse.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.analyse.domain.*;
+import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.utils.DozerUtils;
+import com.onemap.analyse.utils.NpoiHelper;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.security.utils.SecurityUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static com.onemap.analyse.utils.Fxfw2SdeUtils.fzxzvector2Sde;
+
+/**
+ * 策划生成模块定时刷新任务
+ */
+@Component
+public class ChscSchedule {
+    //间隔时间 单位ms
+    public static final long TIME_INTERVAL = 1 * 15000;
+    //任务状态标识码
+    private RwztDTO Rwzt = new RwztDTO();
+    private XzlbDTO xzlbDTO = new XzlbDTO();
+    private FxfwDictDTO fxfwDictDTO = new FxfwDictDTO();
+    @Resource
+    private HgxfxMapper hgxfxMapper;
+    @Resource
+    HgxfxHgscxMapper hgxfxHgscxMapper;
+    @Resource
+    HgxfxScxMapper hgxfxScxMapper;
+    @Resource
+    private FxrwrzMapper fxrwrzMapper;
+    @Resource
+    private FzssChscMapper fzssChscMapper;
+    @Resource
+    private FzssChscFileMapper fzssChscFileMapper;
+    @Resource
+    private HgxfxTemplateMapper hgxfxTemplateMapper;
+    //合规性分析python方法名标识
+    @Value("${Hgxfx.functionId}")
+    private String functionId;
+    @Value("${Hgxfx.temp}")
+    private String temp;
+    private static final Logger log = LoggerFactory.getLogger(ChscSchedule.class);
+
+    @Async("taskExecutor")
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
+    public void ChscStatus() {
+        try {
+            QueryWrapper<FzxzChscDTO> wrapper = new QueryWrapper<FzxzChscDTO>();
+            wrapper.eq("rwzt", Rwzt.getNoJX());
+            //以创建时间正序排列
+            wrapper.orderByAsc("cjsj");
+            //每次只操作一条记录
+            List<FzxzChscDTO> ress = fzssChscMapper.selectList(wrapper);
+            if (ress.size() > 0) {
+                FzxzChscDTO zhxzChsc = ress.get(0);
+                //更新策划生成任务状态
+                QueryWrapper<FzxzChscDTO> chscwrapper = new QueryWrapper<FzxzChscDTO>();
+                chscwrapper.eq("bsm", zhxzChsc.getBsm());
+                zhxzChsc.setRwjd(1);
+                zhxzChsc.setRwzt(Rwzt.getCreate());
+                fzssChscMapper.update(zhxzChsc, chscwrapper);
+                //获取分析范围
+                String curfxfw = "";
+                if (zhxzChsc.getFwlx() == fxfwDictDTO.getShp()) {
+                    FzssChscFileDTO fileDto = fzssChscFileMapper.selectOne(new QueryWrapper<FzssChscFileDTO>().eq("bsm", zhxzChsc.getXzfw()));
+                    curfxfw = fileDto.getWj();
+                }
+                //插入任务日志
+                FxrwrzDTO rzDto = new FxrwrzDTO();
+                rzDto.setRwbsm(zhxzChsc.getBsm());
+                rzDto.setRwlx("策划生成");
+                rzDto.setRzlr("项目策划生成解析");
+                rzDto.setRzlx("info");
+                rzDto.setRzsj(new Date());
+                fxrwrzMapper.insert(rzDto);
+                //根据选址类别区分进行任务分配执行
+                String rwlx = "辅助选址";
+                if (zhxzChsc.getXzlb() == xzlbDTO.getXmxz()) {//项目选址
+                    //TODO 后续对接智慧选址
+                    System.out.println("XZLB暂不支持" + zhxzChsc.getXzlb());
+                    return;
+                } else if (zhxzChsc.getXzlb() == xzlbDTO.getHgxfx()) {
+                    rwlx = "合规性分析";
+                    //插入合规性分析主表
+                    HgxfxDTO fzssHgxfx = DozerUtils.map(zhxzChsc, HgxfxDTO.class);
+                    fzssHgxfx.setCjyh(SecurityUtils.getUsername());
+                    fzssHgxfx.setFxmj(zhxzChsc.getNydmj());
+                    fzssHgxfx.setJsdw(zhxzChsc.getSbdw());
+                    fzssHgxfx.setRwly("OpenAPI");
+                    fzssHgxfx.setBsm(zhxzChsc.getBsm());
+                    fzssHgxfx.setRwzt(Rwzt.getCreate());
+                    //TODO 确认下是否需要任务进度字段
+                    //fzssHgxfx.setRwjd(0);
+                    hgxfxMapper.insert(fzssHgxfx);
+                    //插入合规性分析分析因子表
+                    //默认把基础分析写入到分析因子里面
+                    QueryWrapper<HgxfxScxDTO> basefxyzwrapper = new QueryWrapper<HgxfxScxDTO>();
+                    basefxyzwrapper.eq("kzxjb", 0);
+                    List<HgxfxScxDTO> basefxyz = hgxfxScxMapper.selectList(basefxyzwrapper);
+                    //查询看是否已配置分析因子模板，如果没有全部查询插入分析因子表
+                    HgxfxTemplateDTO template = hgxfxTemplateMapper.selectOne(new QueryWrapper<HgxfxTemplateDTO>().eq("mbmc", zhxzChsc.getYwlx()));
+                    if (template != null) {
+                        QueryWrapper<HgxfxScxDTO> fxyzwrapper = new QueryWrapper<HgxfxScxDTO>();
+                        fxyzwrapper.in("bsm", template.getFxyz().split(",")).orderByAsc("xssx");
+                        List<HgxfxScxDTO> res = hgxfxScxMapper.selectList(fxyzwrapper);
+                        if (res.size() > 0) {
+                            basefxyz.addAll(res);
+                        }
+                    } else {
+                        //查询审查项 默认把控制线级别等于0的也添加进去
+//                        QueryWrapper<HgxfxScxDTO> fxyzwrapper = new QueryWrapper<HgxfxScxDTO>();
+//                        fxyzwrapper.gt("kzxjb", 0).eq("status",1);
+//                        List<HgxfxScxDTO> res = hgxfxScxMapper.selectList(fxyzwrapper);
+//                        if (res.size() > 0) {
+//                            basefxyz.addAll(res);
+//                        }
+                    }
+                    for (HgxfxScxDTO cur : basefxyz) {
+                        HgxfxHgscxDTO scx = new HgxfxHgscxDTO();
+                        scx.setBsm(StringUtils.getUUID());
+                        scx.setRwbsm(zhxzChsc.getBsm());
+                        scx.setScxbsm(cur.getBsm());
+                        scx.setYsmc(cur.getYsmc());
+                        hgxfxHgscxMapper.insert(scx);
+                    }
+                    //TODO 入储备库
+//                    FzssZhxzCbk cbk = zhxzChsc.MapTo<FzssZhxzCbk>();
+//                    cbk.BSM = zhxzChsc.BSM;
+//                    var listFields = EsriClassField.ToFields<FzssZhxzCbk>(cbk);
+//                    PyUtils.Shp2Sde(shpfile, "KJGH.T_FZSS_ZHXZ_CBK", listFields);
+                }
+                FzxzDTO fzxzDTO = new FzxzDTO();
+                fzxzDTO.setBsm(zhxzChsc.getBsm());
+                fzxzDTO.setFwlx(zhxzChsc.getFwlx());
+                fzxzDTO.setXzfw(curfxfw);
+                RequestResult info = fzxzvector2Sde(fzxzDTO, rwlx);
+                if (info != null) {
+                    System.out.println("策划生成分析范围数据入库失败");
+                } else {
+                    System.out.println("策划生成分析模块：" + zhxzChsc.getBsm() + "完成！！！！！！！！ " + new Date().toString());
+                }
+                //进度更新
+                zhxzChsc.setRwzt(Rwzt.getCreate());
+                zhxzChsc.setRwjd(3);
+                fzssChscMapper.update(zhxzChsc, chscwrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/CtfxSchedule.java

@@ -0,0 +1,103 @@
+package com.onemap.analyse.task;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.analyse.domain.*;
+import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.utils.FixedThreadUtil;
+import com.onemap.common.core.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+
+/**
+ * 冲突分析模块定时刷新任务
+ */
+@Component
+public class CtfxSchedule {
+    //间隔时间 单位ms
+    public static final long TIME_INTERVAL = 1 * 15000;
+    //任务状态标识码
+    private RwztDTO Rwzt = new RwztDTO();
+    @Resource
+    private CtfxMapper ctfxMapper;
+    //冲突分析python方法名标识
+    @Value("${Fxpj.Ctfx.functionId}")
+    private String functionId;
+    //冲突分析python方法名标识
+    @Value("${Fxpj.Xmydsyx.functionId}")
+    private String xmydsyxFunctionId;
+    private static final Logger log = LoggerFactory.getLogger(CtfxSchedule.class);
+
+    @Async("taskExecutor")
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
+    public void CtfxStatus() {
+        try {
+            QueryWrapper<TCtfxMainDTO> wrapper = new QueryWrapper<>();
+            wrapper.eq("rwzt", Rwzt.getCreate());
+            //以创建时间正序排列
+            wrapper.orderByAsc("cjsj");
+            //每次只操作一条记录
+            List<TCtfxMainDTO> ress = ctfxMapper.selectList(wrapper);
+            if (ress.size() > 0) {
+                TCtfxMainDTO ctfxMainDTO = ress.get(0);
+                String id = ctfxMainDTO.getId();
+                ctfxMainDTO.setRwzt("1");
+                ctfxMainDTO.setRwkssj(new Date());
+                QueryWrapper<TCtfxMainDTO> update = new QueryWrapper<>();
+                update.eq("id", id);
+                ctfxMapper.update(ctfxMainDTO, update);
+                FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
+                    String result = "";
+                    if ("5".equals(ctfxMainDTO.getSsmk())) {//土地开发利用强度分析
+                        try {
+                            String xzqdm = ctfxMainDTO.getXzqdm();
+                            List<TCtfxTdkfqdDTO> data = ctfxMapper.Tdkfqd("SDE." + ctfxMainDTO.getFxtable(), xzqdm, xzqdm.length(), StringUtils.subxzqdmlevel(xzqdm));
+                            List<TCtfxTdkfqdDTO> results = new ArrayList<>();
+                            String msg = "";
+                            for (TCtfxTdkfqdDTO u : data) {
+                                String curxzqdm = u.getXzqdm();
+                                if (curxzqdm.equals(xzqdm)) {
+                                    msg = u.getXzqmc() + "建设用地约有" + u.getTbmj() + "平方千米，土地开发利用强度为" + u.getProportion() + "%，" + (u.getProportion() > 30 ? "已达到" : "尚未达到") + "警戒线。";
+                                } else {
+                                    results.add(u);
+                                }
+                            }
+                            ctfxMainDTO.setFxjg(msg);
+                            ctfxMainDTO.setStatist(JSON.toJSONString(results));
+                            ctfxMainDTO.setRwzt("2");
+                            ctfxMainDTO.setRwjssj(new Date());
+                            ctfxMapper.update(ctfxMainDTO, update);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            ctfxMainDTO.setFxjg(e.getMessage());
+                            ctfxMainDTO.setRwzt("3");
+                            ctfxMainDTO.setRwjssj(new Date());
+                            ctfxMapper.update(ctfxMainDTO, update);
+                        }
+                    } else if ("6".equals(ctfxMainDTO.getSsmk())) {//项目用地适宜性分析
+                        //执行python
+                        Map<String, String> params = new HashMap<>();
+                        params.put("bsm", id);
+                        result = PythonExecute.Run(xmydsyxFunctionId, params);
+                    } else {
+                        //执行python
+                        Map<String, String> params = new HashMap<>();
+                        params.put("bsm", id);
+                        result = PythonExecute.Run(functionId, params);
+                    }
+                    System.out.println("冲突分析：BSM：" + ctfxMainDTO.getId() + "，结果：" + result);
+                });
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FtpSchedule.java

@@ -0,0 +1,126 @@
+package com.onemap.analyse.task;
+
+import com.onemap.analyse.domain.*;
+import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.utils.CalculateShpArea;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.utils.UnPackageUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.Date;
+
+/**
+ * 策划生成模块ftp文件夹定时刷新任务
+ */
+@Component
+public class FtpSchedule {
+    //间隔时间 单位ms
+    public static final long TIME_INTERVAL = 1 * 15000;
+    //任务状态标识码
+
+    private RwztDTO rwztDTO = new RwztDTO();
+    private XzlbDTO xzlbDTO = new XzlbDTO();
+    private FxfwDictDTO fxfwDictDTO = new FxfwDictDTO();
+    @Resource
+    private HgxfxMapper hgxfxMapper;
+    @Resource
+    HgxfxHgscxMapper hgxfxHgscxMapper;
+    @Resource
+    HgxfxScxMapper hgxfxScxMapper;
+    @Resource
+    private FxrwrzMapper fxrwrzMapper;
+    @Resource
+    private FzssChscMapper fzssChscMapper;
+    @Resource
+    private FzssChscFileMapper fzssChscFileMapper;
+    @Resource
+    private HgxfxTemplateMapper hgxfxTemplateMapper;
+    @Value("${Hgxfx.ftpIn}")
+    private String ftpIn;
+    @Value("${Hgxfx.ftpOut}")
+    private String ftpOut;
+
+    @Async("taskExecutor")
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
+    public void FtpStatus() {
+        try {
+            //TODO 扫描未解压文件，进行数据加压
+            File ftpdirectory = new File(ftpIn);
+            if (!ftpdirectory.isDirectory()) {
+                System.out.println("ftp文件夹配置怎么不是文件夹啊！！！！");
+                return;
+            }
+            File[] filelist = ftpdirectory.listFiles();
+            String unzippath = "";
+            for (int i = 0; i < filelist.length; i++) {
+                File cur = filelist[i];
+                if(cur.isDirectory()){
+                    continue;
+                }
+                //获得文件名称
+                String fileName = cur.getName();
+                String fileRelName = fileName.substring(0, fileName.lastIndexOf("."));
+                String type = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+                if (type.contains("zip") || type.contains("rar")) {
+                    unzippath = ftpIn + "/" + fileRelName;
+                    File dest = new File(unzippath);
+                    //判断文件夹是否存在，存在则跳过，说明已经
+                    if (dest.exists()) {
+                        continue;
+                    }
+                    //解压zip格式
+                    if (type.equals("zip")) {
+                        new UnPackageUtils().unPackZip(cur, unzippath);
+                    } else {
+                        //解压rar格式
+                        new UnPackageUtils().unPackRar(cur, unzippath);
+                    }
+                    String shpPath = "";
+                    File[] files = new File(unzippath).listFiles();
+                    for (File file1 : files) {
+                        if (file1.getAbsolutePath().substring(file1.getAbsolutePath().lastIndexOf(".") + 1).equals("shp")) {
+                            shpPath = file1.getAbsolutePath();
+                            break;
+                        }
+                    }
+                    if (!"".equals(shpPath)) {
+                        //计算shape面积
+                        double mj = CalculateShpArea.getShpArea(shpPath);
+                        String fileid = StringUtils.getUUID();
+                        //TODO 插入到T_FZSS_ZHXZ_FILE数据库表
+                        FzssChscFileDTO fileDTO = new FzssChscFileDTO();
+                        fileDTO.setBsm(fileid);
+                        fileDTO.setWj(shpPath);
+                        fileDTO.setYswj(cur.getAbsolutePath());
+                        fzssChscFileMapper.insert(fileDTO);
+                        //TODO 插入到T_FZSS_ZHXZ_CHSC数据库表
+                        FzxzChscDTO chscDto = new FzxzChscDTO();
+                        chscDto.setXzlb(1);//选址类别（0意向范围筛选，1指定空间位置）
+                        chscDto.setXzfw(fileid);//范围
+                        chscDto.setFwlx(2);//范围类型(0行政区 1绘制  2SHP文件)*当选址类别为1时，范围类型只能是2
+                        chscDto.setXmbm(fileRelName);//项目编码(工改系统)
+                        chscDto.setXmmc(fileRelName);//项目名称
+                        chscDto.setXmdm(fileRelName); //项目代码（建设项目审批管理系统）
+                        chscDto.setYwlx("划拨类");//划拨类/出让类
+                        String uuid = StringUtils.getUUID();
+                        chscDto.setBsm(uuid);
+                        chscDto.setNydmj(mj);
+                        chscDto.setRwzt(rwztDTO.getNoJX());
+                        chscDto.setCjsj(new Date());
+                        fzssChscMapper.insert(chscDto);
+                    } else {
+                        System.out.println("未检索到shp文件， 文件夹名称：" + unzippath);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FzxzPlanSchedule.java

@@ -0,0 +1,197 @@
+package com.onemap.analyse.task;
+
+import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.FzxzXzyzDTO;
+import com.onemap.common.core.web.domain.StatusMsg;
+import com.supermap.analyst.spatialanalyst.OverlayAnalyst;
+import com.supermap.analyst.spatialanalyst.OverlayAnalystParameter;
+import com.supermap.data.*;
+import com.supermap.data.conversion.DataImport;
+import com.supermap.data.conversion.ImportMode;
+import com.supermap.data.conversion.ImportResult;
+import com.supermap.data.conversion.ImportSettingSHP;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * 辅助规划选址，通过超图iObject分析
+ */
+@Component
+public class FzxzPlanSchedule {
+
+
+    /**
+     * @param fzxzDTO  选址任务
+     * @param xzyzList 选址因子
+     */
+    public static void startPlan(FzxzDTO fzxzDTO, List<FzxzXzyzDTO> xzyzList) {
+        StatusMsg statusMsg = new StatusMsg();
+        //初始化失败返回结果
+        if (fzxzDTO.getFwlx() == 1) {
+            //statusMsg = setWorkspace();
+            // 绘制
+            String geoWkt = fzxzDTO.getXzfw();
+            Geometry geometry = Toolkit.WKTToGeometry(geoWkt);
+            statusMsg = siteAnalysis(geometry, xzyzList);
+            //拿到图层
+        } else if (fzxzDTO.getFwlx() == 2) {
+            // shp文件
+            statusMsg = siteAnalysis(fzxzDTO.getXzfw());
+        }
+    }
+
+    //private static StatusMsg setWorkspace() {
+    //    StatusMsg statusMsg = new StatusMsg();
+    //
+    //    DatasourceConnectionInfo info = new DatasourceConnectionInfo();
+    //    info.setEngineType(EngineType.PGGIS);
+    //    //TODO:配置信息放到配置文件中
+    //    info.setServer("192.168.60.202:5432");
+    //    info.setDatabase("real3d");
+    //    info.setUser("postgres");
+    //    info.setPassword("postgres");
+    //
+    //    Workspace mWorkspace = new Workspace();
+    //    Datasource datasource = mWorkspace.getDatasources().open(info);
+    //
+    //    if (datasource == null) {
+    //        statusMsg.setMsg("创建数据源失败");
+    //        statusMsg.setB(false);
+    //        return statusMsg;
+    //    }
+    //    return statusMsg;
+    //}
+
+    //TODO:这里暂时导入不成功
+    private static StatusMsg siteAnalysis(String filePath) {
+        StatusMsg statusMsg = new StatusMsg();
+
+        //1.创建数据源
+        DatasourceConnectionInfo info = new DatasourceConnectionInfo();
+        info.setEngineType(EngineType.PGGIS);
+        //TODO:配置信息放到配置文件中
+        info.setServer("192.168.60.202:5432");
+        info.setDatabase("plan");
+        info.setUser("postgres");
+        info.setPassword("postgres");
+
+        Workspace mWorkspace = new Workspace();
+        Datasource datasource = mWorkspace.getDatasources().open(info);
+
+        if (datasource == null) {
+            statusMsg.setMsg("创建数据源失败");
+            statusMsg.setB(false);
+            return statusMsg;
+        }
+
+        //2.导入数据
+        // 构建目标文件路径
+        String projectRootDir = System.getProperty("user.dir");
+        String targetFilePath = projectRootDir + File.separator + "data" + File.separator + "shp" + File.separator + "xzqh.shp";
+
+        //导入shp文件
+        String originalRegions = "original_regions";
+        ImportSettingSHP importSettingSHP = new ImportSettingSHP();
+        importSettingSHP.setImportMode(ImportMode.OVERWRITE);
+        importSettingSHP.setSourceFilePath(targetFilePath);
+        //设置需要导入的数据编码类型，因为有中文字段，所以用ASCII编码
+        importSettingSHP.setSourceFileCharset(Charset.ANSI);
+        importSettingSHP.setTargetDatasetName(originalRegions);
+
+        //设置要导入的目标数据源
+        importSettingSHP.setTargetDatasource(datasource);
+        DataImport dataImport = new DataImport();
+        dataImport.getImportSettings().add(importSettingSHP);
+
+        ImportResult result = dataImport.run();
+        if (result.getFailedSettings().length != 0) {
+            statusMsg.setMsg("数据导入失败");
+            statusMsg.setB(false);
+            return statusMsg;
+        }
+
+        //3.圈选数据
+        //源数据
+        DatasourceConnectionInfo infoReal3d = new DatasourceConnectionInfo();
+        infoReal3d.setEngineType(EngineType.PGGIS);
+        //TODO:配置信息放到配置文件中
+        infoReal3d.setServer("192.168.60.202:5432");
+        infoReal3d.setDatabase("real3d");
+        infoReal3d.setUser("postgres");
+        infoReal3d.setPassword("postgres");
+
+        Workspace real3dWorkspace = new Workspace();
+        Datasource real3dResource = real3dWorkspace.getDatasources().open(infoReal3d);
+        DatasetVector ghdkaDataset = (DatasetVector) real3dResource.getDatasets().get("vector_GHDKA");
+
+        //圈选区域
+        Datasets datasets = datasource.getDatasets();
+        DatasetVector originalDataset = (DatasetVector) datasets.get(originalRegions);
+
+        QueryParameter parameter = new QueryParameter();
+        parameter.setCursorType(CursorType.STATIC);
+        parameter.setSpatialQueryMode(SpatialQueryMode.CONTAIN);
+        parameter.setSpatialQueryObject(originalDataset);
+        // 进行查询
+        Recordset recordsetRes = ghdkaDataset.query(parameter);
+        int featureCount = recordsetRes.getAllFeatures().size();
+
+        //4.创建圈选后的数据集，并存储数据
+        DatasetVector dataset_result = (DatasetVector) datasets.createFromTemplate(datasets.getAvailableDatasetName("new_GHDKA"), ghdkaDataset);
+        // 将空间查询结果追加到新建的数据集中
+        dataset_result.append(recordsetRes);
+
+        //释放工作空间占有的资源
+        infoReal3d.dispose();
+        real3dWorkspace.dispose();
+
+        info.dispose();
+        mWorkspace.dispose();
+        return statusMsg;
+    }
+
+
+    // 选址分析
+    private static StatusMsg siteAnalysis(Geometry geometry, List<FzxzXzyzDTO> xzyzList) {
+        StatusMsg statusMsg = new StatusMsg();
+        //1.创建数据源
+        DatasourceConnectionInfo info = new DatasourceConnectionInfo();
+        info.setEngineType(EngineType.PGGIS);
+        //TODO:配置信息放到配置文件中
+        info.setServer("192.168.60.202:5432");
+        info.setDatabase("real3d");
+        info.setUser("postgres");
+        info.setPassword("postgres");
+
+        Workspace mWorkspace = new Workspace();
+        Datasource datasource = mWorkspace.getDatasources().open(info);
+
+        //1.打开数据源
+        Datasets datasets = datasource.getDatasets();
+        DatasetVector ghdkaDataset = (DatasetVector) datasets.get("vector_GHDKA");
+        //int allSize = ghdkaDataset.getAllFeatures().size();
+
+        //2.空间数据圈选
+        QueryParameter parameter = new QueryParameter();
+        parameter.setCursorType(CursorType.STATIC);
+        parameter.setSpatialQueryMode(SpatialQueryMode.CONTAIN);
+        parameter.setSpatialQueryObject(geometry);
+        // 进行查询
+        Recordset recordsetRes = ghdkaDataset.query(parameter);
+        int featureCount = recordsetRes.getAllFeatures().size();
+
+        //3.创建圈选后的数据集，并存储数据
+        DatasetVector dataset_result = (DatasetVector) datasets.createFromTemplate(datasets.getAvailableDatasetName("new_GHDKA"), ghdkaDataset);
+        // 将空间查询结果追加到新建的数据集中
+        dataset_result.append(recordsetRes);
+
+        // 释放工作空间占有的资源
+        dataset_result.close();
+        ghdkaDataset.close();
+        mWorkspace.dispose();
+
+        return statusMsg;
+    }
+}