From 2096da83588173e291ef4a50ec2a6d1dfccf86c9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 15 八月 2024 15:15:42 +0800
Subject: [PATCH] 2024-08-15 朱宝民 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml | 2 +-
4 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 658ae3e..682d4eb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
pipIrr:
global:
- dev: fals #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml
index d8dea46..a245416 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml
@@ -95,7 +95,7 @@
<!--鏍规嵁鐗囧尯ID鍒犻櫎璇ョ墖鍖轰笅鐨勫潗鏍囩偣-->
<delete id="deleteByBlockId" parameterType="java.lang.Long">
- DELETE coo.*
+ DELETE coo
FROM ba_map_coordinates coo
INNER JOIN ba_map_graph gra ON gra.id = coo.graph_id
WHERE gra.block_id = #{blockId}
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 a3399dc..7ef677c 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
@@ -266,6 +266,7 @@
* @return
*/
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
@SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Valid Block po, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
@@ -298,14 +299,55 @@
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
}
- // 鍒犻櫎鐗囧尯鍏宠仈鐨勫湴鍥惧浘褰�
- this.sv.deleteMapGraph(blockId);
// 鍒犻櫎鍦板浘鍥惧舰鍧愭爣
this.sv.deleteMapCoordinates(blockId);
+ // 鍒犻櫎鐗囧尯鍏宠仈鐨勫湴鍥惧浘褰�
+ this.sv.deleteMapGraph(blockId);
+
+ JSONArray graphs = po.getGraphs();
+ 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());
+ }
+
+ // 娣诲姞鍦板浘鍥惧舰鍧愭爣璁板綍
+ 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());
+ }
+ }
+ }
+ }
return BaseResponseUtils.buildSuccess(true);
}
-
/**
* 鍒犻櫎鐗囧尯
@@ -325,6 +367,7 @@
//@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
@GetMapping(path = "delete")
+ @Transactional(rollbackFor = Exception.class)
@SsoAop()
public BaseResponse<Boolean> delete(Long id) {
if (id == null) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 89854ee..fd1e45e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -121,7 +121,7 @@
// 灏嗗湴鍥惧浘褰㈡暟缁勬坊鍔犲埌鐗囧尯涓�
if(array_mapGraphs != null && array_mapGraphs.size() > 0) {
- job_block.put("graph", array_mapGraphs);
+ job_block.put("graphs", array_mapGraphs);
}
}
}
--
Gitblit v1.8.0