保存规划结果

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

@@ -1,28 +0,0 @@
-package com.onemap.analyse.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-// @TableName("t_fzss_fzxz_res")
-// @Data
-// 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<>();
-// }

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

@@ -1,19 +0,0 @@
-package com.onemap.analyse.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 辅助选址结果因子
- */
-// @TableName("t_fzss_fzxz_jgyz")
-// @Data
-// public class FzxzJgyzDTO {
-//     // private String bsm;
-//     // private String jbbsm;
-//     // private String yzbsm;
-//     // private String yxyzmc;
-//     // private String yztj;
-//     // private String yxz;
-//     // private String fxjg;
-// }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vector/GhdkaDTO.java

@@ -1,10 +1,7 @@
 package com.onemap.analyse.domain.vector;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 /**
  * 规划地块
  */
-@TableName("GHDKA")
 public class GhdkaDTO {
 }

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

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

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

@@ -1,13 +0,0 @@
-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/FzxzResMapper.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/base/FzxzResMapper.java

@@ -1,10 +1,14 @@
-package com.onemap.analyse.mapper;
+package com.onemap.analyse.mapper.base;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.analyse.domain.FzxzResDTO;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 辅助选址结果
  */
 public interface FzxzResMapper extends BaseMapper<FzxzResDTO> {
+    void saveOne(FzxzResDTO fzxzResDTO);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/vector/GhdkaMapper.java

@@ -15,4 +15,12 @@ public interface GhdkaMapper extends BaseMapper<GhdkaDTO> {
     List<Integer> getIdByArea(Map<String, Object> params);
 
     List<Integer> getIdByFilter(GhdkaFilter ghdkaFilter);
+
+    /**
+     * 根据idList，sjy 获取geom，ydmj
+     *
+     * @param params idList，sjy
+     * @return id，geom，ydmj
+     */
+    List<Map<String, Object>> getAreaGeom(Map<String, Object> params);
 }

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

@@ -8,6 +8,7 @@ import com.onemap.analyse.domain.query.GhdkaFilter;
 import com.onemap.analyse.domain.res.FzxzResultDTO;
 import com.onemap.analyse.domain.res.GeomRes;
 import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.mapper.base.ShpFileMapper;
 import com.onemap.analyse.mapper.vector.GhdkaMapper;
 import com.onemap.analyse.service.IFzssService;
@@ -255,6 +256,25 @@ public class FzssServiceImpl implements IFzssService {
         String ydxz = (String) resMap.get("ydxz");
 
         List<Integer> dkIds = (List<Integer>) resMap.get("dkIds");
+
+
+        // /**
+        //  * 根据idList，sjy 获取geom，ydmj
+        //  *
+        //  * @param params idList，sjy
+        //  * @return id，geom，ydmj
+        //  */
+        // Map<String, Object> getAreaGeom(Map<String, Object> params);
+
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("sjy", sjyb);
+        paramMap.put("idList", dkIds);
+        List<Map<String, Object>> dkSelectMap = ghdkaMapper.getAreaGeom(paramMap);
+        Map<Integer, Map<String, Object>> dksMap = new HashMap<>();
+        for (Map<String, Object> map : dkSelectMap) {
+            dksMap.put((Integer) map.get("id"), map);
+        }
+
         for (Integer dkId : dkIds) {
             FzxzResDTO fzxzResDTO = DozerUtils.map(resMap, FzxzResDTO.class);
             fzxzResDTO.setBsm(StringUtils.getUUID());
@@ -263,10 +283,13 @@ public class FzssServiceImpl implements IFzssService {
             fzxzResDTO.setYdxz(ydxz);
             fzxzResDTO.setCreateAt(new Date());
             fzxzResDTO.setDkid(dkId);
-            // fzxzResDTO.setArea();
-            // fzxzResDTO.setGeom();
+            if (dksMap.containsKey(dkId)) {
+                Map<String, Object> dkMap = dksMap.get(dkId);
+                fzxzResDTO.setArea((Double) dkMap.get("ydmj"));
+                fzxzResDTO.setGeom((String) dkMap.get("geom"));
+            }
 
-            fzxzResMapper.insert(fzxzResDTO);
+            fzxzResMapper.saveOne(fzxzResDTO);
         }
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.base.Joiner;
 import com.onemap.analyse.domain.*;
 import com.onemap.analyse.mapper.*;
+import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.utils.NpoiHelper;
 import com.onemap.analyse.utils.NumberUtil;
 import com.onemap.common.core.utils.StringUtils;
@@ -24,7 +25,6 @@ import java.io.*;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 辅助选址模块定时刷新任务

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/base/FzxzResMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.onemap.analyse.mapper.base.FzxzResMapper">
+    <insert id="saveOne">
+        INSERT INTO t_fzss_fzxz_res (bsm, rwbsm, sjyb, ydxz, create_at, area, geom, dkid)
+        VALUES (#{bsm}, #{rwbsm}, #{sjyb}, #{ydxz}, now(),
+                #{area}, public.st_geomfromewkt(#{geom,jdbcType=OTHER}), #{dkid})
+    </insert>
+
+</mapper>

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/GhdkaMapper.xml

@@ -61,4 +61,13 @@
             )
         </if>
     </select>
+    <select id="getAreaGeom" parameterType="arraylist" resultType="map">
+        SELECT
+        id,ydmj,public.st_asewkt(geom) as geom
+        FROM "${sjy}"
+        WHERE id in
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>