Merge branch 'f-xiaogu' into dev

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

@@ -212,7 +212,7 @@ public class FzssServiceImpl implements IFzssService {
 
         // 5.切割地块，面积筛选
         // TODO 删除异常面积,临时方案
-        tableDateService.delByAreaAnd(rawTable, 0,1500);
+        tableDateService.delByAreaAnd(rawTable, 0, 1500);
         integer = tableDateService.getTableCount(rawTable);
         if (integer == 0) {
             iLogService.saveLog(taskId, "辅助选址", "计算完成，未找到符合用地性质条件数据", "info");
@@ -559,12 +559,12 @@ public class FzssServiceImpl implements IFzssService {
                 if (rawTable.containsKey("dkbm") && rawTable.containsKey("kzxxgydmc")) {
                     if (dkMap.containsKey("dkbm")) {
                         dkMap.put("dkbm", dkMap.get("dkbm") + "," + rawTable.get("dkbm"));// 地块编码
-                    }else{
+                    } else {
                         dkMap.put("dkbm", rawTable.get("dkbm"));// 地块编码
                     }
                     if (dkMap.containsKey("kzxxgydmc")) {
                         dkMap.put("kzxxgydmc", dkMap.get("kzxxgydmc") + "," + rawTable.get("kzxxgydmc"));// 地块类型
-                    }else {
+                    } else {
                         dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
                     }
                 }
@@ -575,6 +575,7 @@ public class FzssServiceImpl implements IFzssService {
             dkMap.put("geom", selectionRes.getGeom());
             dkMap.put("id", selectionRes.getBsm());
             dkMap.put("area", NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(selectionRes.getArea())));// 面积
+            dkMap.put("landIds", rawItemIdList);
 
             dkMaps.add(dkMap);
         }

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

@@ -73,6 +73,7 @@
         CREATE TABLE "${newTableName}" AS
         SELECT id, public.ST_Intersection(inTbale.geom, public.st_geomfromewkt(#{ewkt})) AS geom
         FROM "${tableName}" inTbale
+        AND NOT public.ST_IsEmpty(public.ST_Intersection(inTbale.geom, public.st_geomfromewkt(#{ewkt})))
         WHERE public.ST_Intersects(inTbale.geom, public.st_geomfromewkt(#{ewkt}))
         <if test="tableIds != null and tableIds.size() > 0">
             AND inTbale.id::VARCHAR IN