图斑详情修改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/GdbhJgService.java

@@ -2,15 +2,13 @@ package com.onemap.apply.service.gdbh.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.onemap.apply.domain.gdbh.GdbhDto;
-import com.onemap.apply.domain.gdbh.GdbhRwMxDto;
-import com.onemap.apply.domain.gdbh.GdbhRwMxYzDto;
-import com.onemap.apply.domain.gdbh.GdbhYzDTO;
+import com.onemap.apply.domain.gdbh.*;
 import com.onemap.apply.domain.res.ApiTTable;
 import com.onemap.apply.domain.res.ApiTTableFiled;
 import com.onemap.apply.mapper.gdbh.*;
 import com.onemap.apply.service.analyse.HttpAnalyseService;
 import com.onemap.apply.service.gdbh.ITGdbhRwGeomService;
+import com.onemap.apply.utils.LandTypeReader;
 import com.onemap.common.core.utils.NumberUtil;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.AjaxResult;
@@ -223,7 +221,22 @@ public class GdbhJgService {
 
         Map<String, Object> retMap = new HashMap<>();
         retMap.put("yzjg", ret);
-        retMap.put("tbxx", iTGdbhRwGeomService.selectTGdbhRwGeomById(id));
+
+        // 获取土地类型数据
+        TGdbhRwGeom tGdbhRwGeom = iTGdbhRwGeomService.selectTGdbhRwGeomById(id);
+        if (tGdbhRwGeom != null && tGdbhRwGeom.getGeomJson() != null) {
+            Map<String, Object> geomMap = JSON.parseObject(tGdbhRwGeom.getGeomJson(), Map.class);
+            // 获取土地类型数据
+            Map<String, Map<String, String>> landTypeMap = LandTypeReader.INSTANCE.readLandTypeJson();
+            if (geomMap.containsKey("qlx") && StringUtils.isNotEmpty(geomMap.get("qlx").toString()) && landTypeMap.get("qlx").containsKey(geomMap.get("qlx").toString())) {
+                geomMap.put("qlx", landTypeMap.get("qlx").get(geomMap.get("qlx").toString()));
+            }
+            if (geomMap.containsKey("hlx") && StringUtils.isNotEmpty(geomMap.get("hlx").toString()) && landTypeMap.get("hlx").containsKey(geomMap.get("hlx").toString())) {
+                geomMap.put("hlx", landTypeMap.get("hlx").get(geomMap.get("hlx").toString()));
+            }
+            tGdbhRwGeom.setGeomJson(JSON.toJSONString(geomMap));
+        }
+        retMap.put("tbxx", tGdbhRwGeom);
         return RequestResult.success(retMap);
     }
 }