详情里返回空间信息

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

@@ -12,7 +12,9 @@ public class FzxzDTO {
     private String bsm;// 标识码
     private Integer rwzt;// 任务状态(0创建 1执行中 2完成 3错误)
     private Date cjsj;// 创建时间
-    private String cjyh;// 创建用户
+    @TableField(value = "user_id")
+    private Long userId;// 创建用户
+    // private String cjyh;// 创建用户
     private Date rwkssj;// 任务开始时间
     private Date rwjssj;// 任务结束时间
     private String fxbg;// 分析报告

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

@@ -17,6 +17,7 @@ public class FzxzResultDTO {
     private String xmmc;
     private String jsdw;
     private String fxbg;//分析报告地址
+    private String geom;
 
     // 结果返回地块信息
     @TableField(exist = false)

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

@@ -7,6 +7,7 @@ import com.onemap.common.datasource.annotation.Master;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 辅助选址 数据层
@@ -20,5 +21,5 @@ public interface FzxzMapper extends BaseMapper<FzxzDTO> {
     FzxzEntityDTO GetFzxzByBsm(@Param("bsm") String bsm);
 
     @Master
-    List<FzxzDTO> getList(String startTime, String endTime, String name);
+    List<FzxzDTO> getList(Map<String, Object> paramMap);
 }

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.onemap.common.datasource.annotation.Slave;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
 
@@ -50,7 +51,7 @@ public class FzssServiceImpl implements IFzssService {
     //**后写逻辑**//
     @Autowired
     GhdkaMapper ghdkaMapper;
-
+    // 空间范围记录
     @Autowired
     ShpFileMapper shpFileMapper;
     // 辅助选址结果
@@ -134,7 +135,7 @@ public class FzssServiceImpl implements IFzssService {
 
         // 存储规划任务
         fzxzDTO.setRwzt(Rwzt.getCreate());
-        fzxzDTO.setCjyh(SecurityUtils.getUsername());
+        fzxzDTO.setUserId(SecurityUtils.getUserId());
 
         fzxzCalc.setFzxzDTO(fzxzDTO);
         fzxzCalc.setXzyxList(xzyxList);
@@ -320,6 +321,7 @@ public class FzssServiceImpl implements IFzssService {
                 fzxzResDTO.setGeom((String) dkMap.get("geom"));
             }
             // TODO 设置土地价格
+            fzxzResDTO.setLandPrice(100.0);
             fzxzResMapper.saveOne(fzxzResDTO);
         }
     }
@@ -345,6 +347,10 @@ public class FzssServiceImpl implements IFzssService {
 
         // 构建返回结果
         FzxzResultDTO result = DozerUtils.map(fzxzinfo, FzxzResultDTO.class);
+        // 返回选址空间范围
+        String geomId = fzxzinfo.getGeomId();
+        GeomRes geomRes = shpFileMapper.getOne(geomId);
+        result.setGeom(geomRes.getGeom());
 
         // 查询分析结果信息
         List<FzxzResDTO> fzxzResDTOS = fzxzResMapper.getListByRwbsm(result.getBsm());
@@ -390,9 +396,16 @@ public class FzssServiceImpl implements IFzssService {
 
     @Override
     public RequestResult GetXzResList(String startTime, String endTime, String name) {
-        List<FzxzDTO> fzxzDTOS = fzxzMapper.getList(startTime, endTime, name);
+        Long userId = SecurityUtils.getUserId();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("userId", userId);
+        paramMap.put("xmmc", name);
+        paramMap.put("startTime", startTime);
+        paramMap.put("endTime", endTime);
+
 
-        return null;
+        List<FzxzDTO> fzxzDTOS = fzxzMapper.getList(paramMap);
+        return RequestResult.success("查询成功！", fzxzDTOS);
     }
 
     /**

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

@@ -63,8 +63,17 @@
     </select>
 
     <select id="getList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.FzxzDTO">
-        select xmmc,
-        from T_FZSS_FZXZ_TB
-        where t.RWBSM = #{rwbsm}
+        select *
+        from t_fzss_fzxz
+        where t_fzss_fzxz.cjyh = #{userId}
+        <if test="name != null and name != ''">
+            and t_fzss_fzxz.xmmc like '%'||#{name}||'%'
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and t_fzss_fzxz.cjsj &gt;= to_date(#{startTime}, 'YYYY-MM-DD')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and t_fzss_fzxz.cjsj &lt;= to_date(#{endTime}, 'YYYY-MM-DD')
+        </if>
     </select>
 </mapper>