From 9c32918e2d2db0dcc8b3a3af2be72831252019d9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 08 二月 2025 09:28:02 +0800
Subject: [PATCH] 涉嫌偷水功能完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 137 +++++++++++++++++++++++----------------------
1 files changed, 70 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 eb0b48b..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);
}
--
Gitblit v1.8.0