切换到pg数据库

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

@@ -63,7 +63,7 @@ public class ChscSchedule {
     private static final Logger log = LoggerFactory.getLogger(ChscSchedule.class);
 
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
     public void ChscStatus() {
         try {
             QueryWrapper<FzxzChscDTO> wrapper = new QueryWrapper<FzxzChscDTO>();

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

@@ -37,7 +37,7 @@ public class CtfxSchedule {
     private static final Logger log = LoggerFactory.getLogger(CtfxSchedule.class);
 
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
     public void CtfxStatus() {
         try {
             QueryWrapper<TCtfxMainDTO> wrapper = new QueryWrapper<>();

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

@@ -47,7 +47,7 @@ public class FtpSchedule {
     private String ftpOut;
 
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
     public void FtpStatus() {
         try {
             //TODO 扫描未解压文件，进行数据加压

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

@@ -111,10 +111,6 @@ public class FzxzPlanSchedule {
             statusMsg.setB(false);
             return statusMsg;
         }
-        //DatasetVector dataset = (DatasetVector) datasource.getDatasets().get("vector_plan");
-        //int all1Size = dataset.getAllFeatures().size();
-        //System.out.println("");
-
 
         //3.圈选数据
         //源数据
@@ -130,11 +126,6 @@ public class FzxzPlanSchedule {
         Datasource real3dResource = real3dWorkspace.getDatasources().open(infoReal3d);
         DatasetVector ghdkaDataset = (DatasetVector) real3dResource.getDatasets().get("vector_GHDKA");
 
-        //1.打开数据源
-        //Datasets datasets = datasource.getDatasets();
-        //DatasetVector ghdkaDataset = (DatasetVector) datasets.get("vector_GHDKA");
-
-
         //圈选区域
         Datasets datasets = datasource.getDatasets();
         DatasetVector originalDataset = (DatasetVector) datasets.get(originalRegions);
@@ -152,8 +143,10 @@ public class FzxzPlanSchedule {
         // 将空间查询结果追加到新建的数据集中
         dataset_result.append(recordsetRes);
 
-
         //释放工作空间占有的资源
+        infoReal3d.dispose();
+        real3dWorkspace.dispose();
+
         info.dispose();
         mWorkspace.dispose();
         return statusMsg;

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

@@ -69,7 +69,7 @@ public class HgxfxSchedule {
      * 合规性分析执行入口
      */
     @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+    //@Scheduled(fixedDelay = TIME_INTERVAL)
     public void HgxfxStatus() {
         try {
             QueryWrapper<HgxfxDTO> wrapper = new QueryWrapper<HgxfxDTO>();

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

@@ -46,7 +46,7 @@ public class ZbmxMxjsSchedule {
      * 辅助选址执行入口
      */
 //    @Async("taskExecutor")
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+//    @Scheduled(fixedDelay = TIME_INTERVAL)
     public void zbmxMxjsStatus() {
         try {
             //获取状态为0的计算任务

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

@@ -57,7 +57,7 @@ public class ZttSchedule {
      */
     @Async("taskExecutor")
 //    @Transactional(rollbackFor = Exception.class)
-    @Scheduled(fixedDelay = TIME_INTERVAL)
+//    @Scheduled(fixedDelay = TIME_INTERVAL)
     public void ZttStatus() {
         try {
             QueryWrapper<ZttDTO> wrapper = new QueryWrapper<ZttDTO>();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -1,8 +1,7 @@
 package com.onemap.apply.controller.fzss;
 
-import com.onemap.apply.domain.fzss.FzxzEntityDTO;
-import com.onemap.apply.domain.fzss.FzxzTemplateDTO;
-import com.onemap.apply.domain.fzss.HgxfxDTO;
+import com.onemap.apply.domain.config.fzss.FzxzEntityDTO;
+import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 import com.onemap.apply.service.fzss.IFzxzService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -46,12 +45,11 @@ public class FzxzController extends BaseController {
     /**
      * 获取辅助选址因子列表
      *
-     * @param lx 预留 因子类型
      * @return
      */
     @GetMapping("/GetFxyzList")
-    public RequestResult GetFxyzList(String lx) {
-        RequestResult list = fzxzService.GetFxyzList(lx);
+    public RequestResult GetFxyzList() {
+        RequestResult list = fzxzService.GetFxyzList();
         return list;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/GhtgController.java

@@ -1,14 +1,11 @@
 package com.onemap.apply.controller.fzss;
 
-import com.onemap.apply.domain.fzss.FzxzTemplateDTO;
-import com.onemap.apply.domain.fzss.TGhtzTgDTO;
-import com.onemap.apply.service.fzss.IFzxzService;
+import com.onemap.apply.domain.config.fzss.TGhtzTgDTO;
 import com.onemap.apply.service.fzss.IGhtgService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.core.web.page.RecordTableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/HgxfxController.java

@@ -1,11 +1,10 @@
 package com.onemap.apply.controller.fzss;
 
-import com.onemap.apply.domain.fzss.HgxfxDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxDTO;
 import com.onemap.apply.service.fzss.IHgxfxService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.core.web.page.RecordTableDataInfo;
-import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/ZjxmglController.java

@@ -1,6 +1,6 @@
 package com.onemap.apply.controller.fzss;
 
-import com.onemap.apply.domain.fzss.PzwjstdDTO;
+import com.onemap.apply.domain.config.fzss.PzwjstdDTO;
 import com.onemap.apply.service.fzss.IZjxmglService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/scpz/ExamgctaskController.java

@@ -1,29 +1,22 @@
 package com.onemap.apply.controller.scpz;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.onemap.apply.domain.cggl.EscalationDTO;
 import com.onemap.apply.domain.cggl.EscalationIMPDTO;
-import com.onemap.apply.domain.fzss.HgxfxDTO;
 import com.onemap.apply.domain.scpz.ExamGCTaskDo;
-import com.onemap.apply.domain.scpz.ExamTaskDo;
-import com.onemap.apply.domain.scpz.ExamruledicDO;
-import com.onemap.apply.domain.yzt.ZttDTO;
 import com.onemap.apply.mapper.cggl.EscalationImpMapper;
 import com.onemap.apply.mapper.cggl.EscalationMapper;
 import com.onemap.apply.mapper.scpz.ExamtaskMapper;
 import com.onemap.apply.service.cggl.CgglService;
-import com.onemap.apply.service.impl.cggl.CgglServiceImpl;
 import com.onemap.apply.service.scpz.IExamruleService;
 import com.onemap.apply.service.scpz.IExamgctaskService;
 import com.onemap.apply.utils.ZipDownload;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.utils.file.FileUtils;
 import com.onemap.common.core.web.controller.BaseController;
-import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/yzt/ZttKController.java

@@ -1,9 +1,6 @@
 package com.onemap.apply.controller.yzt;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.onemap.apply.domain.fzss.HgxfxDTO;
-import com.onemap.apply.domain.yzt.ZttDTO;
-import com.onemap.apply.domain.yzt.ZttMbkDTO;
 import com.onemap.apply.domain.yzt.ZttkDTO;
 import com.onemap.apply.mapper.yzt.ZttKMapper;
 import com.onemap.apply.service.yzt.IZttKService;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FxrwrzDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FxrwrzDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzDldmTreeDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzDldmTreeDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 import java.util.ArrayList;
 import java.util.List;

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

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzSjyDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzSjyDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzTemplateDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzTemplateDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzYzDTO.java

@@ -0,0 +1,21 @@
+package com.onemap.apply.domain.config.fzss;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("t_fzss_fzxz_yz")
+@Data
+public class FzxzYzDTO {
+    //标识码
+    private String bsm;
+    //影响因子名称
+    private String yxyzmc;
+    //目录等级
+    private Integer level;
+    //上级标识码
+    private String parent_bsm;
+    //是否包含影响值
+    private Boolean has_yxz;
+    //空间判断类型
+    private String spatial_type;
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxDTO.java

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

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

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxGisDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxGisDTO.java

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

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

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxJcxsDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxJcxsDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 import java.util.ArrayList;
 import java.util.List;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/HgxfxScxDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxScxDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/PzwjstdDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/PzwjstdDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgDetailDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgDetailDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgclDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgclDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgclDetailDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgclDetailDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgrzDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgrzDTO.java

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

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TGhtzTgysDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TGhtzTgysDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/TgclTypeDTO.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/TgclTypeDTO.java

@@ -1,4 +1,4 @@
-package com.onemap.apply.domain.fzss;
+package com.onemap.apply.domain.config.fzss;
 
 //调规附件类型(0空间数据 1调规材料)
 public class TgclTypeDTO {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/fzss/FzxzYzDTO.java

@@ -1,97 +0,0 @@
-package com.onemap.apply.domain.fzss;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-@TableName("t_fzss_fzxz_yz")
-public class FzxzYzDTO {
-    private String  bsm;
-    private String  yxyzmc;
-    private String  yztj;
-    private String  yxz;
-    private String  lx;
-    private String  sjlx;
-    private String  sjy;
-    private String  gltj;
-    private String  fxjg_c;
-    private String  fxjg_n;
-
-    public String getBsm() {
-        return bsm;
-    }
-
-    public void setBsm(String bsm) {
-        this.bsm = bsm;
-    }
-
-    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 getLx() {
-        return lx;
-    }
-
-    public void setLx(String lx) {
-        this.lx = lx;
-    }
-
-    public String getSjlx() {
-        return sjlx;
-    }
-
-    public void setSjlx(String sjlx) {
-        this.sjlx = sjlx;
-    }
-
-    public String getSjy() {
-        return sjy;
-    }
-
-    public void setSjy(String sjy) {
-        this.sjy = sjy;
-    }
-
-    public String getGltj() {
-        return gltj;
-    }
-
-    public void setGltj(String gltj) {
-        this.gltj = gltj;
-    }
-
-    public String getFxjg_c() {
-        return fxjg_c;
-    }
-
-    public void setFxjg_c(String fxjg_c) {
-        this.fxjg_c = fxjg_c;
-    }
-
-    public String getFxjg_n() {
-        return fxjg_n;
-    }
-
-    public void setFxjg_n(String fxjg_n) {
-        this.fxjg_n = fxjg_n;
-    }
-}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FxrwrzMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.FxrwrzDTO;
+import com.onemap.apply.domain.config.fzss.FxrwrzDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzMapper.java

@@ -1,9 +1,9 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.FzxzDTO;
-import com.onemap.apply.domain.fzss.FzxzDldmTreeDTO;
-import com.onemap.apply.domain.fzss.FzxzEntityDTO;
+import com.onemap.apply.domain.config.fzss.FzxzDTO;
+import com.onemap.apply.domain.config.fzss.FzxzDldmTreeDTO;
+import com.onemap.apply.domain.config.fzss.FzxzEntityDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzSjyMapper.java

@@ -1,10 +1,8 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.config.fzss.FzxzSjyDTO;
 import com.onemap.apply.domain.fzss.*;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzTemplateMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.FzxzTemplateDTO;
+import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzYzMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.FzxzYzDTO;
+import com.onemap.apply.domain.config.fzss.FzxzYzDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/GhclMapper.java

@@ -1,8 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.TGhtzTgDTO;
-import com.onemap.apply.domain.fzss.TGhtzTgclDTO;
+import com.onemap.apply.domain.config.fzss.TGhtzTgclDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/GhrzMapper.java

@@ -1,8 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.TGhtzTgclDTO;
-import com.onemap.apply.domain.fzss.TGhtzTgrzDTO;
+import com.onemap.apply.domain.config.fzss.TGhtzTgrzDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/GhtgMapper.java

@@ -1,12 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.FzxzDldmTreeDTO;
-import com.onemap.apply.domain.fzss.FzxzEntityDTO;
-import com.onemap.apply.domain.fzss.TGhtzTgDTO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+import com.onemap.apply.domain.config.fzss.TGhtzTgDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/HgxfxEntityMapper.java

@@ -1,10 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.HgxfxDTO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+import com.onemap.apply.domain.config.fzss.HgxfxDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/HgxfxGisMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.HgxfxGisDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxGisDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/HgxfxHgscxMapper.java

@@ -1,10 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.HgxfxHgscxDTO;
-import com.onemap.apply.domain.fzss.HgxfxJcxsDTO;
-
-import java.util.List;
+import com.onemap.apply.domain.config.fzss.HgxfxHgscxDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/HgxfxMapper.java

@@ -1,10 +1,10 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.HgxfxDTO;
-import com.onemap.apply.domain.fzss.HgxfxFxtbDTO;
-import com.onemap.apply.domain.fzss.HgxfxJcxsDTO;
-import com.onemap.apply.domain.fzss.HgxfxScxDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxFxtbDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxJcxsDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxScxDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/PzwjstdMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.fzss.PzwjstdDTO;
+import com.onemap.apply.domain.config.fzss.PzwjstdDTO;
 
 /**
  * 批准未建设土地

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.service.fzss;
 
-import com.onemap.apply.domain.fzss.FzxzEntityDTO;
-import com.onemap.apply.domain.fzss.FzxzTemplateDTO;
+import com.onemap.apply.domain.config.fzss.FzxzEntityDTO;
+import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 import com.onemap.common.core.web.domain.RequestResult;
 
 import java.util.List;
@@ -12,7 +12,7 @@ public interface IFzxzService {
 
     RequestResult GetDldmTree(String fzbs);
 
-    RequestResult GetFxyzList(String lx);
+    RequestResult GetFxyzList();
 
     List<FzxzTemplateDTO> GetTemplateList(String search);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IGhtgService.java

@@ -1,6 +1,6 @@
 package com.onemap.apply.service.fzss;
 
-import com.onemap.apply.domain.fzss.TGhtzTgDTO;
+import com.onemap.apply.domain.config.fzss.TGhtzTgDTO;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.web.multipart.MultipartFile;
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IHgxfxService.java

@@ -1,6 +1,6 @@
 package com.onemap.apply.service.fzss;
 
-import com.onemap.apply.domain.fzss.HgxfxDTO;
+import com.onemap.apply.domain.config.fzss.HgxfxDTO;
 import com.onemap.common.core.web.domain.RequestResult;
 
 import java.util.List;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IZjxmglService.java

@@ -1,6 +1,6 @@
 package com.onemap.apply.service.fzss;
 
-import com.onemap.apply.domain.fzss.PzwjstdDTO;
+import com.onemap.apply.domain.config.fzss.PzwjstdDTO;
 import com.onemap.common.core.web.domain.RequestResult;
 
 import java.util.List;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -1,6 +1,7 @@
 package com.onemap.apply.service.impl.fzss;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.config.fzss.*;
 import com.onemap.apply.domain.fzss.*;
 import com.onemap.apply.mapper.fzss.FzxzMapper;
 import com.onemap.apply.mapper.fzss.FzxzSjyMapper;
@@ -73,12 +74,9 @@ public class FzxzServiceImpl implements IFzxzService {
     }
 
     @Override
-    public RequestResult GetFxyzList(String lx) {
+    public RequestResult GetFxyzList() {
         try {
-            QueryWrapper<FzxzYzDTO> wrapper = new QueryWrapper<FzxzYzDTO>();
-            if (!StringUtils.isEmpty(lx)) {
-                wrapper.eq("lx", lx);
-            }
+            QueryWrapper<FzxzYzDTO> wrapper = new QueryWrapper<>();
             List<FzxzYzDTO> res = fzxzYzMapper.selectList(wrapper);
             return RequestResult.success("查询成功", res);
         } catch (Exception e) {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/GhtgServiceImpl.java

@@ -2,6 +2,7 @@ package com.onemap.apply.service.impl.fzss;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.config.fzss.*;
 import com.onemap.apply.domain.fzss.*;
 import com.onemap.apply.mapper.fzss.GhclMapper;
 import com.onemap.apply.mapper.fzss.GhrzMapper;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/HgxfxServiceImpl.java

@@ -1,6 +1,7 @@
 package com.onemap.apply.service.impl.fzss;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.config.fzss.*;
 import com.onemap.apply.domain.fzss.*;
 import com.onemap.apply.mapper.fzss.*;
 import com.onemap.apply.service.fzss.IHgxfxService;
@@ -10,7 +11,6 @@ import com.onemap.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
 import java.util.*;
 
 @Service

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/ZjxmglServiceImpl.java

@@ -1,7 +1,7 @@
 package com.onemap.apply.service.impl.fzss;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.onemap.apply.domain.fzss.PzwjstdDTO;
+import com.onemap.apply.domain.config.fzss.PzwjstdDTO;
 import com.onemap.apply.mapper.fzss.PzwjstdMapper;
 import com.onemap.apply.service.fzss.IZjxmglService;
 import com.onemap.common.core.utils.StringUtils;

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fzss/FzxzMapper.xml

@@ -5,13 +5,13 @@
 <mapper namespace="com.onemap.apply.mapper.fzss.FzxzMapper">
 
 
-    <select id="GetDldmTree" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.FzxzDldmTreeDTO">
+    <select id="GetDldmTree" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.FzxzDldmTreeDTO">
         select t.dm as "value",
        t.mc as "label",
        t.fdm as "parent" from T_FZSS_FZXZ_DICT t where t.fzbs = #{fzbs} order by t.dm , t.fdm, t.xssx
     </select>
 
-    <select id="GetFzxzList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.FzxzEntityDTO">
+    <select id="GetFzxzList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.FzxzEntityDTO">
         select t.bsm as "bsm",
         t.sjy as "sjy",
         sjy.sjymc "sjymc",

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.onemap.apply.mapper.fzss.HgxfxMapper">
 
 
-    <select id="GetPage" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxDTO">
+    <select id="GetPage" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxDTO">
         select t.bsm as "bsm",
         t.fxmj as "fxmj",
         t.xmmc as "xmmc",
@@ -30,7 +30,7 @@
         order by t.cjsj desc
     </select>
 
-    <select id="getJcxs" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxJcxsDTO">
+    <select id="getJcxs" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxJcxsDTO">
         select t.bsm as "bsm",
        t.rwbsm as "rwbsm",
        t.scxbsm as "scxbsm",
@@ -46,7 +46,7 @@
        order by scx.kzxjb
     </select>
 
-    <select id="getFxtb" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxFxtbDTO">
+    <select id="getFxtb" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxFxtbDTO">
        select xz.ydyhfldm as "dldm2",
         xz.ydyhflmc as "dlmc2",
         (select d.dldm from t_dict_dldm d where d.fzbs = 'GH' and d.dldm = substr(xz.ydyhfldm,0,2)) as "dldm1",

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/FzxzMapper.xml

@@ -5,13 +5,13 @@
 <mapper namespace="com.onemap.apply.mapper.fzss.FzxzMapper">
 
 
-    <select id="GetDldmTree" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.FzxzDldmTreeDTO">
+    <select id="GetDldmTree" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.FzxzDldmTreeDTO">
         select t.dm as "value",
        t.mc as "label",
        t.fdm as "parent" from T_FZSS_FZXZ_DICT t where t.fzbs = #{fzbs} order by t.dm , t.fdm, t.xssx
     </select>
 
-    <select id="GetFzxzList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.FzxzEntityDTO">
+    <select id="GetFzxzList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.FzxzEntityDTO">
         select t.bsm as "bsm",
         t.sjy as "sjy",
         sjy.sjymc "sjymc",

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.onemap.apply.mapper.fzss.HgxfxMapper">
 
 
-    <select id="GetPage" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxDTO">
+    <select id="GetPage" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxDTO">
         select t.bsm as "bsm",
         t.fxmj as "fxmj",
         t.xmmc as "xmmc",
@@ -30,7 +30,7 @@
         order by t.cjsj desc
     </select>
 
-    <select id="getJcxs" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxJcxsDTO">
+    <select id="getJcxs" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxJcxsDTO">
         select t.bsm as "bsm",
        t.rwbsm as "rwbsm",
        t.scxbsm as "scxbsm",
@@ -46,7 +46,7 @@
        order by scx.kzxjb
     </select>
 
-    <select id="getFxtb" parameterType="java.lang.String" resultType="com.onemap.apply.domain.fzss.HgxfxFxtbDTO">
+    <select id="getFxtb" parameterType="java.lang.String" resultType="com.onemap.apply.domain.config.fzss.HgxfxFxtbDTO">
        select xz.ydyhfldm as "dldm2",
         xz.ydyhflmc as "dlmc2",
         (select d.dldm from t_dict_dldm d where d.fzbs = 'GH' and d.dldm = substr(xz.ydyhfldm,0,2)) as "dldm1",