地块返回

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

@@ -17,6 +17,7 @@ import com.onemap.analyse.mapper.base.ShpFileMapper;
 import com.onemap.analyse.mapper.vector.GhdkaMapper;
 import com.onemap.analyse.service.*;
 import com.onemap.analyse.utils.DozerUtils;
+import com.onemap.analyse.utils.UnitsUtil;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.datasource.annotation.Master;
@@ -447,11 +448,11 @@ public class FzssServiceImpl implements IFzssService {
         // 查询地块信息
         String resourceTable = "";
         List<Integer> dkIds = new ArrayList<>();
-        Map<Integer,FzxzResDTO> dkResMap=new HashMap<>();
+        Map<Integer, FzxzResDTO> dkResMap = new HashMap<>();
         for (FzxzResDTO fzxzResDTO : fzxzResDTOS) {
             resourceTable = fzxzResDTO.getSjyb();
             dkIds.add(fzxzResDTO.getDkid());
-            dkResMap.put(fzxzResDTO.getDkid(),fzxzResDTO);
+            dkResMap.put(fzxzResDTO.getDkid(), fzxzResDTO);
         }
 
         Map<String, Object> paramMap = new HashMap<>();
@@ -467,12 +468,13 @@ public class FzssServiceImpl implements IFzssService {
         for (FzxzResDTO fzxzResDTO : fzxzResDTOS) {
             Map<String, Object> dkMap = new HashMap<>();
             if (dkRawMap.containsKey(fzxzResDTO.getDkid())) {
-                Integer dkId=fzxzResDTO.getDkid();
+                Integer dkId = fzxzResDTO.getDkid();
                 Map<String, Object> dkInfoMap = dkRawMap.get(fzxzResDTO.getDkid());
                 dkMap.put("dkbm", dkInfoMap.get("dkbm"));// 地块编码
                 dkMap.put("kzxxgydmc", dkInfoMap.get("kzxxgydmc"));// 地块类型
                 dkMap.put("landPrice", fzxzResDTO.getLandPrice());// 地价
-                dkMap.put("geom",dkResMap.get(dkId).getGeom());
+                dkMap.put("geom", dkResMap.get(dkId).getGeom());
+                // dkMap.put("area", UnitsUtil.m2ToMu(dkResMap.get(dkId).getArea()));// 面积
                 dkMap.put("area", dkResMap.get(dkId).getArea());// 面积
             }
             dkMaps.add(dkMap);

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/utils/UnitsUtil.java

@@ -8,4 +8,11 @@ public class UnitsUtil {
         }
         return m2 * 0.0015;
     }
+    // 平方米转亩函数
+    public static double m2ToMu(Double m2) {
+        if (m2 == null) {
+            return 0;
+        }
+        return m2 * 0.0015;
+    }
 }

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/base/FzxzResMapper.xml

@@ -16,8 +16,8 @@
                sjyb,
                ydxz,
                create_at,
-               area,
-               public.st_asewkt(geom) AS geom,
+               public.st_area(geom::public.geography) as area,
+               public.st_asewkt(geom)                 AS geom,
                dkid
         FROM t_fzss_fzxz_res
         WHERE rwbsm = #{rwbsm}