选址结果返回

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

@@ -2,6 +2,7 @@ package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,6 +18,7 @@ public class FzxzResDTO {
     String sjyb;// 数据源表
     String ydxz;// 用地性质
     @TableField(value = "create_at")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     Date createAt;
     Double area;
     String geom;

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/base/FzxzResMapper.java

@@ -11,4 +11,6 @@ import java.util.Map;
  */
 public interface FzxzResMapper extends BaseMapper<FzxzResDTO> {
     void saveOne(FzxzResDTO fzxzResDTO);
+
+   List<FzxzResDTO> getListByRwbsm(String rwbsm);
 }

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

@@ -257,15 +257,6 @@ public class FzssServiceImpl implements IFzssService {
 
         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);
@@ -309,9 +300,7 @@ public class FzssServiceImpl implements IFzssService {
         // 构建返回结果
         FzxzResultDTO result = DozerUtils.map(fzxzinfo, FzxzResultDTO.class);
         // 查询分析结果地块信息
-        QueryWrapper<FzxzResDTO> fzxzWrapper = new QueryWrapper<>();
+        List<FzxzResDTO> fzxzResDTOS = fzxzResMapper.getListByRwbsm(result.getBsm());
-        fzxzWrapper.eq("rwbsm", result.getBsm());
-        List<FzxzResDTO> fzxzResDTOS = fzxzResMapper.selectList(fzxzWrapper);
         result.setDks(fzxzResDTOS);
         // 查询选址因子
         QueryWrapper<FzxzXzyzDTO> xzyzWrapper = new QueryWrapper<>();

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

@@ -2,10 +2,26 @@
 <!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">
+
+    <resultMap type="com.onemap.analyse.domain.FzxzResDTO" id="fzxzResMap">
+
+    </resultMap>
     <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>
+<select id="getListByRwbsm" resultMap="fzxzResMap">
+    SELECT bsm,
+           rwbsm,
+           sjyb,
+           ydxz,
+           create_at,
+           area,
+           public.st_asewkt(geom) AS geom,
+           dkid
+    FROM t_fzss_fzxz_res
+    WHERE rwbsm = #{rwbsm}
 
+</select>
 </mapper>

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

@@ -49,7 +49,7 @@
         where  t.bsm = #{bsm}
         order by t.cjsj desc
     </select>
-    <select id="GetFzxzTbByBsm" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.FzxzTbEntityDTO">
+    <select id="GetOneByBsm" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.FzxzTbEntityDTO">
         select t.OBJECTID as "objectid",
         t.RWBSM as "rwbsm",
         t.YDYHFLDM as "ydyhfldm",