From 39f05c294a46772b9e901a54244a042ec055fdfc Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 16 八月 2024 18:18:05 +0800
Subject: [PATCH] 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/BlockSv.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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 fd1e45e..47438b6 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
@@ -93,12 +93,13 @@
// 鑾峰彇鐗囧尯鍒楄〃
List<VoBlock> list_blocks = this.dao.getBlocks(params);
if(list_blocks != null && list_blocks.size() > 0) {
- //JSONArray array_blocks = (JSONArray) JSON.toJSON(list_blocks);
array_blocks = (JSONArray) JSON.toJSON(list_blocks);
for (int i = 0; i < array_blocks.size(); i++) {
JSONObject job_block = array_blocks.getJSONObject(i);
Long blockId = job_block.getLong("id");
+ // 澶勭悊涓�涓柊鐨勭墖鍖哄墠娓呯┖graphs锛岄伩鍏嶄笂涓�涓墖鍖虹殑graphs瀛樼暀鏁版嵁閫犳垚鏁版嵁閿欒
+ array_mapGraphs = null;
// 鏍规嵁鐗囧尯ID鑾峰彇鍦板浘鍥惧舰鍒楄〃
List<VoMapGraph> list_mapGraphs = this.dao.gertMapGraphsByBlockId(blockId);
if(list_mapGraphs != null && list_mapGraphs.size() > 0) {
@@ -113,8 +114,10 @@
List<VoMapCoordinates> list_mapCoordinates = this.dao.getCoordinatesByGraphId(graphId);
if(list_mapCoordinates != null && list_mapCoordinates.size() > 0) {
JSONArray array_mapCoordinates = (JSONArray) JSON.toJSON(list_mapCoordinates);
- job_mapGraph.put("coordinates", array_mapCoordinates);
- String cc= "";
+
+ JSONArray[] arrays = new JSONArray[1];
+ arrays[0] = array_mapCoordinates;
+ job_mapGraph.put("coordinates", arrays);
}
}
}
--
Gitblit v1.8.0