From 346b480ab7848c742065e9bf989abaf43b515613 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 21 四月 2025 15:05:26 +0800
Subject: [PATCH] 获取轮灌组详情
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 152 ++++++++++++++++++++++++++++----------------------
1 files changed, 85 insertions(+), 67 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index a6bb146..2f545ab 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/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);
}
@@ -388,4 +391,19 @@
return BaseResponseUtils.buildSuccess(true);
}
+
+ /**
+ * 鑾峰彇鐗囧尯銆佸垎姘存埧鑱斿姩瑙嗗浘锛屾坊鍔犲啘鎴锋椂浣跨敤
+ * @return
+ */
+ @GetMapping(path = "/block_divides")
+ @SsoAop()
+ public BaseResponse<JSONArray> getBlockDivides() {
+ try {
+ return BaseResponseUtils.buildSuccess(this.sv.getBlockDivides());
+ } catch (Exception e) {
+ log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0