修改城镇开发边界因子

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

@@ -17,6 +17,7 @@ public class SelectionDTO {
     private Date rwkssj;// 任务开始时间
     private Date rwjssj;// 任务结束时间
     private String fxbg;// 分析报告
+    private boolean inCzkfbj=true;// 是否在城镇开发边界内
     private String ydxz_bsm;// 用地性质标识码
     private Float ydmjbegin;// 用地面积范围开始
     private Float ydmjend;// 用地面积范围结束

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

@@ -81,7 +81,9 @@ public class FzssServiceImpl implements IFzssService {
     private MultipleMapper multipleMapper;
     //**需要拿出来的逻辑**//
 
-    private static final String SJY = "TB_GHDK";
+    private static final String TB_GHDK = "TB_GHDK";
+    private static final String TB_CZGH = "TB_CZGH";
+    private String SJY = "";
 
     /**
      * 保存选址参数
@@ -98,10 +100,14 @@ public class FzssServiceImpl implements IFzssService {
         fzxzDTO.setBsm(StringUtils.getUUID());
         fzxzDTO.setCjsj(new Date());
         fzxzDTO.setYdxz_bsm(fzxzDTO.getYdxz_bsm().replaceAll("\\[", "").replaceAll("\\]", ""));
-        // TODO 数据源
-        if (fzxzDTO.getSjy() == null) {
-            fzxzDTO.setSjy(SJY);
+
+        // 如果是在城镇开发边界外，需要使用村庄规划地块
+        if (fzxzDTO.isInCzkfbj()) {
+            SJY = TB_GHDK;
+        } else {
+            SJY = TB_CZGH;
         }
+        fzxzDTO.setSjy(SJY);
 
         // 选址因子
         List<FactorUseDTO> factorUseDTOS = selectPilotVo.getFactorList();
@@ -458,7 +464,7 @@ public class FzssServiceImpl implements IFzssService {
                     //2. 添加规划限高
                     rawTable = createUtilsDBService.addColumnValue(rawTable, SJY, "jzxgd");
                     //3.保留符合高程值的地块
-                    rawTable = createUtilsDBService.getHeightLimit(rawTable,"TB_JKXG");
+                    rawTable = createUtilsDBService.getHeightLimit(rawTable, "TB_JKXG");
                     System.out.println("");
                 }
             }