添加建筑限高

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

@@ -546,8 +546,9 @@ public class FzssServiceImpl implements IFzssService {
             String rawTableName = selectionInfo.getSjy();
             String rawItemIds = selectionRes.getDkid();
             List<String> columns = new ArrayList<>();
-            columns.add("dkbm");
+            columns.add("kzxxgyddm");
             columns.add("kzxxgydmc");
+            columns.add("jzxgd");
 
             List<String> rawItemIdList = Arrays.asList(rawItemIds.split(","));
             // TODO 查询多地块信息
@@ -555,22 +556,26 @@ public class FzssServiceImpl implements IFzssService {
 
             // 构建地块返回结果
             Map<String, Object> dkMap = new HashMap<>();
+            float originValue = 999;
             for (Map<String, Object> rawTable : rawTables) {
-                if (rawTable.containsKey("dkbm") && rawTable.containsKey("kzxxgydmc")) {
-                    if (dkMap.containsKey("dkbm")) {
-                        dkMap.put("dkbm", dkMap.get("dkbm") + "," + rawTable.get("dkbm"));// 地块编码
-                    } else {
-                        dkMap.put("dkbm", rawTable.get("dkbm"));// 地块编码
-                    }
-                    if (dkMap.containsKey("kzxxgydmc")) {
-                        dkMap.put("kzxxgydmc", dkMap.get("kzxxgydmc") + "," + rawTable.get("kzxxgydmc"));// 地块类型
-                    } else {
-                        dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
+                if (dkMap.containsKey("dkbm")) {
+                    dkMap.put("dkbm", dkMap.get("dkbm") + "," + rawTable.get("dkbm"));// 地块编码
+                } else {
+                    dkMap.put("dkbm", rawTable.get("dkbm"));// 地块编码
+                }
+                if (dkMap.containsKey("kzxxgydmc")) {
+                    dkMap.put("kzxxgydmc", dkMap.get("kzxxgydmc") + "," + rawTable.get("kzxxgydmc"));// 地块类型
+                } else {
+                    dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
+                }
+                if (dkMap.containsKey("jzxgd")) {
+                    if (rawTable.get("jzxgd") != null) {
+                        originValue = (float) rawTable.get("jzxgd") < originValue ? (float) rawTable.get("jzxgd") : originValue;
                     }
                 }
             }
 
-
+            dkMap.put("jzxgd", originValue==999?0:originValue);// 限高
             dkMap.put("landPrice", NumberUtil.double2TwoDecimal(selectionRes.getLandPrice()));// 地价
             dkMap.put("geom", selectionRes.getGeom());
             dkMap.put("id", selectionRes.getBsm());