Merge branch 'master' of http://114.244.114.158:8802/gushoubang/one-code-manage

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

@@ -37,12 +37,9 @@ public class NodeLandController extends BaseController {
             if (geomDbId == null || geomDbId.trim().isEmpty()) {
                 return R.fail("geomDbId不能为空");
             }
-            boolean success = nodeLandService.createNodeLand(nodeId, geomDbId);
-            if (success) {
-                return R.ok();
-            } else {
-                return R.fail("创建节点地块关联记录失败");
-            }
+            nodeLandService.createNodeLand(nodeId, geomDbId);
+
+            return R.ok();
         } catch (Exception e) {
             logger.error("创建节点地块关联记录异常", e);
             return R.fail("创建节点地块关联记录异常：" + e.getMessage());
@@ -84,15 +81,8 @@ public class NodeLandController extends BaseController {
                 return R.fail("nodeId不能为空");
             }
 
-            int deletedCount = nodeLandService.deleteByNodeId(nodeId);
-
-            Map<String, Object> responseData = new HashMap<>();
-            responseData.put("nodeId", nodeId);
-            responseData.put("deletedCount", deletedCount);
-            responseData.put("success", deletedCount > 0);
-
-            return R.ok(responseData);
-
+            nodeLandService.deleteByNodeId(nodeId);
+            return R.ok();
         } catch (Exception e) {
             logger.error("删除节点地块关联记录异常", e);
             return R.fail("删除节点地块关联记录异常：" + e.getMessage());

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

@@ -25,16 +25,14 @@ public interface NodeLandMapper {
      *
      * @param nodeId 节点ID
      * @param geomDbId 几何数据库ID
-     * @return 影响行数
      */
-    int insertByNodeIdAndGeomDbId(String nodeId, String geomDbId);
+    void insertByNodeIdAndGeomDbId(String nodeId, String geomDbId);
 
     /**
      * 根据node_id删除记录
      *
      * @param nodeId 节点ID
-     * @return 影响行数
      */
-    int deleteByNodeId(String nodeId);
+    void deleteByNodeId(String nodeId);
 
 }

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

@@ -13,10 +13,9 @@ public interface NodeLandService {
      *
      * @param nodeId 节点ID
      * @param geomDbId 几何数据库ID
-     * @return 是否创建成功
      */
-    boolean createNodeLand(String nodeId, String geomDbId);
-    
+    void createNodeLand(String nodeId, String geomDbId);
+
     /**
      * 根据nodeId查询地块几何信息，返回ewkt格式
      *
@@ -24,12 +23,11 @@ public interface NodeLandService {
      * @return geom字符串数组
      */
     List<String> getGeomByNodeId(String nodeId);
-    
+
     /**
      * 根据nodeId删除节点地块关联记录
      *
      * @param nodeId 节点ID
-     * @return 删除的记录数
      */
-    int deleteByNodeId(String nodeId);
+    void deleteByNodeId(String nodeId);
 }

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

@@ -24,32 +24,25 @@ public class NodeLandServiceImpl implements NodeLandService {
     
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean createNodeLand(String nodeId, String geomDbId) {
+    public void createNodeLand(String nodeId, String geomDbId) {
         try {
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 logger.warn("创建节点地块关联失败：nodeId不能为空");
-                return false;
+                throw new IllegalArgumentException("nodeId不能为空");
             }
 
             if (geomDbId == null || geomDbId.trim().isEmpty()) {
                 logger.warn("创建节点地块关联失败：geomDbId不能为空");
-                return false;
+                throw new IllegalArgumentException("geomDbId不能为空");
             }
 
             // 先删除该nodeId的所有关联记录
-            int deletedCount = nodeLandMapper.deleteByNodeId(nodeId);
-            logger.info("删除了 {} 条已存在的节点地块关联记录，nodeId: {}", deletedCount, nodeId);
+            nodeLandMapper.deleteByNodeId(nodeId);
+            logger.info("删除已存在的节点地块关联记录，nodeId: {}", nodeId);
 
             // 创建新的关联记录
-            int result = nodeLandMapper.insertByNodeIdAndGeomDbId(nodeId, geomDbId);
-
-            if (result > 0) {
-                logger.info("成功创建节点地块关联记录，nodeId: {}, geomDbId: {}", nodeId, geomDbId);
-                return true;
-            } else {
-                logger.warn("创建节点地块关联记录失败，nodeId: {}, geomDbId: {}", nodeId, geomDbId);
-                return false;
-            }
+            nodeLandMapper.insertByNodeIdAndGeomDbId(nodeId, geomDbId);
+            logger.info("成功创建节点地块关联记录，nodeId: {}, geomDbId: {}", nodeId, geomDbId);
 
         } catch (Exception e) {
             logger.error("创建节点地块关联记录异常，nodeId: {}, geomDbId: {}", nodeId, geomDbId, e);
@@ -76,20 +69,19 @@ public class NodeLandServiceImpl implements NodeLandService {
     }
     
     @Override
-    public int deleteByNodeId(String nodeId) {
+    public void deleteByNodeId(String nodeId) {
         try {
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 logger.warn("删除节点地块关联失败：nodeId不能为空");
-                return 0;
+                throw new IllegalArgumentException("nodeId不能为空");
             }
-            
-            int deletedCount = nodeLandMapper.deleteByNodeId(nodeId);
-            logger.info("删除了 {} 条节点地块关联记录，nodeId: {}", deletedCount, nodeId);
-            return deletedCount;
-            
+
+            nodeLandMapper.deleteByNodeId(nodeId);
+            logger.info("删除节点地块关联记录，nodeId: {}", nodeId);
+
         } catch (Exception e) {
             logger.error("删除节点地块关联记录异常，nodeId: {}", nodeId, e);
-            return 0;
+            throw e;
         }
     }
 }