Преглед изворни кода

调整图斑展示面积接口

chenendian пре 3 месеци
родитељ
комит
5996497c75

+ 1 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeLandController.java

@@ -136,7 +136,7 @@ public class NodeLandController extends BaseController {
             }
             Map<String, String> projectGeomInfo = new LinkedHashMap<>();
             Project project =  projectService.get(projectId);
-            Map<String, String> geomInfo = nodeLandService.selectGeomById(geomId);
+            Map<String, Object> geomInfo = nodeLandService.selectGeomByDbId(geomId);
             projectGeomInfo.put("projectId", project.getId());
             projectGeomInfo.put("name", project.getName());
             projectGeomInfo.put("code", project.getCode());

+ 4 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/NodeLandMapper.java

@@ -52,9 +52,12 @@ public interface NodeLandMapper {
 
     NodeLand selectByNodeId(@Param("nodeId")String nodeId);
 
-    List<Map<String, String>> selectTGeomDbDetailsByNodeId(@Param("nodeId")String nodeId, @Param("geomId")String geomId);
+    List<Map<String, String>> selectGeomDbDetailsByNodeId(@Param("nodeId")String nodeId, @Param("geomId")String geomId);
 
     Map<String, String> selectGeomContainsNode(@Param("detailsId")String detailsId);
 
+    List<Map<String, Object>> selectGeomDetailsByGeomDbId( @Param("geomDbId")String geomDbId);
+
+
 
 }

+ 1 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/NodeLandService.java

@@ -51,8 +51,7 @@ public interface NodeLandService {
 
     Map<String,String> selectGeomContainsNode(String geomDetailsId);
 
-    Map<String, String> selectGeomById(String geomDetailsId) ;
-
+    Map<String, Object> selectGeomByDbId(String geomDetailsId) ;
 
 
 

+ 16 - 5
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeLandImpl.java

@@ -198,7 +198,7 @@ public class NodeLandImpl implements NodeLandService {
     @Override
     public List<Map<String,String>> selectTGeomDbDetailsByNodeId(String nodeId) {
         // 获取地块 空间数据ID
-        return nodeLandMapper.selectTGeomDbDetailsByNodeId(nodeId,null);
+        return nodeLandMapper.selectGeomDbDetailsByNodeId(nodeId,null);
     }
 
 
@@ -207,13 +207,24 @@ public class NodeLandImpl implements NodeLandService {
         return nodeLandMapper.selectGeomContainsNode(geomDetailsId);
     }
 
+    /**
+     * 存在一个节点多个地块,一次上传多个地块
+     * @param geomDbId
+     * @return
+     */
     @Override
-    public Map<String, String> selectGeomById(String geomDetailsId) {
-        List<Map<String, String>>  list =  nodeLandMapper.selectTGeomDbDetailsByNodeId(null,geomDetailsId);
+    public Map<String, Object> selectGeomByDbId(String geomDbId) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<Map<String, Object>>  list =  nodeLandMapper.selectGeomDetailsByGeomDbId(geomDbId);
         if(CollectionUtils.isNotEmpty(list)){
-            return list.get(0);
+            Double area =  0d;
+            for(Map<String,Object> tmpMap : list){
+                area +=  (Double) tmpMap.get("geom_area");
+            }
+            map = list.get(0);
+            map.put("geom_area", area);
         }
-        return null;
+        return map;
     }
 
 

+ 8 - 1
siwei-modules/siwei-apply/src/main/resources/mapper/NodeLandMapper.xml

@@ -94,7 +94,7 @@
     </select>
 
     <!--  根据nodeId,查询出当前具体的图斑ID -->
-    <select id="selectTGeomDbDetailsByNodeId" parameterType="String" resultType="java.util.Map">
+    <select id="selectGeomDbDetailsByNodeId" parameterType="String" resultType="java.util.Map">
         select  details.id, public.st_asewkt(details.geom) AS  geom, details.upload_id, details.geom_json, details.sort, details.geom_area
         from t_geom_db_details  details
                  INNER JOIN   t_node_land node    on  node.geom_db_id=details.upload_id
@@ -119,6 +119,13 @@
     </select>
 
 
+    <!--  根据nodeId,查询出当前具体的图斑ID -->
+    <select id="selectGeomDetailsByGeomDbId" parameterType="String" resultType="java.util.Map">
+        select  details.id, public.st_asewkt(details.geom) AS  geom, details.upload_id, details.geom_json,
+                details.sort,   CAST(details.geom_area AS FLOAT)  geom_area
+        from t_geom_db_details  details
+        WHERE details.upload_id = #{geomDbId}
+    </select>
 
 
 </mapper>