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,42 +168,44 @@
        }

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

            // 添加地图图形记录
            BaMapGraph baMapGraph = new BaMapGraph();
            baMapGraph.setBlockId(blockId);
            switch (graph.getString("type")) {
                case "CircleMarker":
                    baMapGraph.setGraphType(graphTypeENUM.CIRCLE_MARKER.getCode());
                    break;
                case "Polygon":
                    baMapGraph.setGraphType(graphTypeENUM.POLYGON.getCode());
                    break;
                case "Polyline":
                    baMapGraph.setGraphType(graphTypeENUM.POLYLINE.getCode());
                    break;
            }
            Long graphId = Optional.ofNullable(this.sv.addMapGraph(baMapGraph)).orElse(0L);
            if (graphId.equals(0)) {
                return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
            }
                // 添加地图图形记录
                BaMapGraph baMapGraph = new BaMapGraph();
                baMapGraph.setBlockId(blockId);
                switch (graph.getString("type")) {
                    case "CircleMarker":
                        baMapGraph.setGraphType(graphTypeENUM.CIRCLE_MARKER.getCode());
                        break;
                    case "Polygon":
                        baMapGraph.setGraphType(graphTypeENUM.POLYGON.getCode());
                        break;
                    case "Polyline":
                        baMapGraph.setGraphType(graphTypeENUM.POLYLINE.getCode());
                        break;
                }
                Long graphId = Optional.ofNullable(this.sv.addMapGraph(baMapGraph)).orElse(0L);
                if (graphId.equals(0)) {
                    return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                }

            // 添加地图图形坐标记录
            JSONArray coordinates = graph.getJSONArray("coordinates");
            for (int j = 0; j < coordinates.size(); j++) {
                JSONArray coordinate = coordinates.getJSONArray(j);
                for (int k = 0; k < coordinate.size(); k++) {
                    JSONObject point = coordinate.getJSONObject(k);
                // 添加地图图形坐标记录
                JSONArray coordinates = graph.getJSONArray("coordinates");
                for (int j = 0; j < coordinates.size(); j++) {
                    JSONArray coordinate = coordinates.getJSONArray(j);
                    for (int k = 0; k < coordinate.size(); k++) {
                        JSONObject point = coordinate.getJSONObject(k);

                    BaMapCoordinates mapCoordinates = new BaMapCoordinates();
                    mapCoordinates.setGraphId(graphId);
                    mapCoordinates.setLat(point.getBigDecimal("lat"));
                    mapCoordinates.setLng(point.getBigDecimal("lng"));
                    Long coordinateId = Optional.ofNullable(this.sv.addMapCoordinate(mapCoordinates)).orElse(0L);
                    if (coordinateId.equals(0)) {
                        return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                        BaMapCoordinates mapCoordinates = new BaMapCoordinates();
                        mapCoordinates.setGraphId(graphId);
                        mapCoordinates.setLat(point.getBigDecimal("lat"));
                        mapCoordinates.setLng(point.getBigDecimal("lng"));
                        Long coordinateId = Optional.ofNullable(this.sv.addMapCoordinate(mapCoordinates)).orElse(0L);
                        if (coordinateId.equals(0)) {
                            return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                        }
                    }
                }
            }
@@ -302,47 +304,48 @@
        this.sv.deleteMapGraph(blockId);

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

            // 添加地图图形记录
            BaMapGraph baMapGraph = new BaMapGraph();
            baMapGraph.setBlockId(blockId);
            switch (graph.getString("type")) {
                case "CircleMarker":
                    baMapGraph.setGraphType(graphTypeENUM.CIRCLE_MARKER.getCode());
                    break;
                case "Polygon":
                    baMapGraph.setGraphType(graphTypeENUM.POLYGON.getCode());
                    break;
                case "Polyline":
                    baMapGraph.setGraphType(graphTypeENUM.POLYLINE.getCode());
                    break;
            }
            Long graphId = Optional.ofNullable(this.sv.addMapGraph(baMapGraph)).orElse(0L);
            if (graphId.equals(0)) {
                return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
            }
                // 添加地图图形记录
                BaMapGraph baMapGraph = new BaMapGraph();
                baMapGraph.setBlockId(blockId);
                switch (graph.getString("type")) {
                    case "CircleMarker":
                        baMapGraph.setGraphType(graphTypeENUM.CIRCLE_MARKER.getCode());
                        break;
                    case "Polygon":
                        baMapGraph.setGraphType(graphTypeENUM.POLYGON.getCode());
                        break;
                    case "Polyline":
                        baMapGraph.setGraphType(graphTypeENUM.POLYLINE.getCode());
                        break;
                }
                Long graphId = Optional.ofNullable(this.sv.addMapGraph(baMapGraph)).orElse(0L);
                if (graphId.equals(0)) {
                    return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                }

            // 添加地图图形坐标记录
            JSONArray coordinates = graph.getJSONArray("coordinates");
            for (int j = 0; j < coordinates.size(); j++) {
                JSONArray coordinate = coordinates.getJSONArray(j);
                for (int k = 0; k < coordinate.size(); k++) {
                    JSONObject point = coordinate.getJSONObject(k);
                // 添加地图图形坐标记录
                JSONArray coordinates = graph.getJSONArray("coordinates");
                for (int j = 0; j < coordinates.size(); j++) {
                    JSONArray coordinate = coordinates.getJSONArray(j);
                    for (int k = 0; k < coordinate.size(); k++) {
                        JSONObject point = coordinate.getJSONObject(k);

                    BaMapCoordinates mapCoordinates = new BaMapCoordinates();
                    mapCoordinates.setGraphId(graphId);
                    mapCoordinates.setLat(point.getBigDecimal("lat"));
                    mapCoordinates.setLng(point.getBigDecimal("lng"));
                    Long coordinateId = Optional.ofNullable(this.sv.addMapCoordinate(mapCoordinates)).orElse(0L);
                    if (coordinateId.equals(0)) {
                        return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                        BaMapCoordinates mapCoordinates = new BaMapCoordinates();
                        mapCoordinates.setGraphId(graphId);
                        mapCoordinates.setLat(point.getBigDecimal("lat"));
                        mapCoordinates.setLng(point.getBigDecimal("lng"));
                        Long coordinateId = Optional.ofNullable(this.sv.addMapCoordinate(mapCoordinates)).orElse(0L);
                        if (coordinateId.equals(0)) {
                            return BaseResponseUtils.buildErrorMsg(SystemResultCode.SAVA_BLOCK_ERROR.getMessage());
                        }
                    }
                }
            }
        }

        return BaseResponseUtils.buildSuccess(true);
    }