Browse Source

查询地块修改

gushoubang 2 months ago
parent
commit
e0d5611cde

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

@@ -31,27 +31,18 @@ public class NodeLandController extends BaseController {
         try {
             String nodeId = requestBody.get("nodeId");
             String geomDbId = requestBody.get("geomDbId");
-
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 return R.fail("nodeId不能为空");
             }
-
             if (geomDbId == null || geomDbId.trim().isEmpty()) {
                 return R.fail("geomDbId不能为空");
             }
-
             boolean success = nodeLandService.createNodeLand(nodeId, geomDbId);
-
             if (success) {
-                Map<String, Object> responseData = new HashMap<>();
-                responseData.put("nodeId", nodeId);
-                responseData.put("geomDbId", geomDbId);
-                responseData.put("success", true);
-                return R.ok(responseData);
+                return R.ok();
             } else {
                 return R.fail("创建节点地块关联记录失败");
             }
-
         } catch (Exception e) {
             logger.error("创建节点地块关联记录异常", e);
             return R.fail("创建节点地块关联记录异常:" + e.getMessage());
@@ -65,13 +56,13 @@ public class NodeLandController extends BaseController {
      * @return 地块几何信息列表
      */
     @GetMapping("/geom/{nodeId}")
-    public R<List<Map<String, String>>> getGeomByNodeId(@PathVariable String nodeId) {
+    public R<List<String>> getGeomByNodeId(@PathVariable String nodeId) {
         try {
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 return R.fail("nodeId不能为空");
             }
 
-            List<Map<String, String>> geomList = nodeLandService.getGeomByNodeId(nodeId);
+            List<String> geomList = nodeLandService.getGeomByNodeId(nodeId);
             return R.ok(geomList);
 
         } catch (Exception e) {

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

@@ -16,9 +16,9 @@ public interface NodeLandMapper {
      * 根据node_id查询地块几何信息,返回ewkt格式
      *
      * @param nodeId 节点ID
-     * @return 包含nodeId和geom字段的Map列表,key和value都是String类型
+     * @return geom字符串数组
      */
-    List<Map<String, String>> selectGeomByNodeId(String nodeId);
+    List<String> selectGeomByNodeId(String nodeId);
 
     /**
      * 根据node_id和geom_db_id创建记录

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

@@ -21,9 +21,9 @@ public interface NodeLandService {
      * 根据nodeId查询地块几何信息,返回ewkt格式
      *
      * @param nodeId 节点ID
-     * @return 包含nodeId和geom字段的Map列表
+     * @return geom字符串数组
      */
-    List<Map<String, String>> getGeomByNodeId(String nodeId);
+    List<String> getGeomByNodeId(String nodeId);
     
     /**
      * 根据nodeId删除节点地块关联记录

+ 4 - 4
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeLandServiceImpl.java

@@ -58,17 +58,17 @@ public class NodeLandServiceImpl implements NodeLandService {
     }
     
     @Override
-    public List<Map<String, String>> getGeomByNodeId(String nodeId) {
+    public List<String> getGeomByNodeId(String nodeId) {
         try {
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 logger.warn("查询地块几何信息失败:nodeId不能为空");
                 return null;
             }
-            
-            List<Map<String, String>> geomList = nodeLandMapper.selectGeomByNodeId(nodeId);
+
+            List<String> geomList = nodeLandMapper.selectGeomByNodeId(nodeId);
             logger.info("查询到 {} 条地块几何信息,nodeId: {}", geomList.size(), nodeId);
             return geomList;
-            
+
         } catch (Exception e) {
             logger.error("查询地块几何信息异常,nodeId: {}", nodeId, e);
             return null;

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

@@ -18,9 +18,8 @@
     </sql>
 
     <!-- 根据node_id查询地块几何信息,返回ewkt格式 -->
-    <select id="selectGeomByNodeId" resultType="map" parameterType="String">
+    <select id="selectGeomByNodeId" resultType="String" parameterType="String">
         SELECT
-            nl.node_id as nodeId,
             ST_AsEWKT(gd.geom) as geom
         FROM t_node_land nl
         LEFT JOIN t_geom_db_details gd ON nl.geom_db_id = gd.upload_id