Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-29 38ccc6273a0135d9120286f6f73d838dd6b60a15

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java

@@ -168,6 +168,7 @@
        }

        JSONArray graphs = po.getGraphs();
        if(graphs != null && graphs.size() > 0){
        for (int i = 0; i < graphs.size(); i++) {
            JSONObject graph = graphs.getJSONObject(i);

@@ -204,6 +205,7 @@
                    Long coordinateId = Optional.ofNullable(this.sv.addMapCoordinate(mapCoordinates)).orElse(0L);
                    if (coordinateId.equals(0)) {
                        return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                        }
                    }
                }
            }
@@ -302,6 +304,7 @@
        this.sv.deleteMapGraph(blockId);

        JSONArray graphs = po.getGraphs();
        if(graphs != null && graphs.size() > 0){
        for (int i = 0; i < graphs.size(); i++) {
            JSONObject graph = graphs.getJSONObject(i);

@@ -342,7 +345,7 @@
                }
            }
        }

        }
        return BaseResponseUtils.buildSuccess(true);
    }