From ad416630c480a4e4af46674192b08277d17e1f1e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 10 九月 2024 08:37:39 +0800
Subject: [PATCH] 2024-09-10 朱宝民 片区、分水房二级联动
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 2286f3d..8d0b720 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
@@ -7,20 +7,24 @@
import com.dy.pipIrrGlobal.daoBa.BaBlockMapper;
import com.dy.pipIrrGlobal.daoBa.BaMapCoordinatesMapper;
import com.dy.pipIrrGlobal.daoBa.BaMapGraphMapper;
+import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
import com.dy.pipIrrGlobal.pojoBa.BaMapCoordinates;
import com.dy.pipIrrGlobal.pojoBa.BaMapGraph;
import com.dy.pipIrrGlobal.voBa.VoBlock;
import com.dy.pipIrrGlobal.voBa.VoMapCoordinates;
import com.dy.pipIrrGlobal.voBa.VoMapGraph;
+import com.dy.pipIrrGlobal.voPr.VoSimpleDivide;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
@Slf4j
@Service
@@ -38,6 +42,9 @@
@Autowired
private BaMapCoordinatesMapper baMapCoordinatesMapper;
+
+ @Autowired
+ private PrDivideMapper prDivideMapper;
/**
* 寰楀埌涓�涓墖鍖�
@@ -212,4 +219,32 @@
return this.baMapCoordinatesMapper.deleteByBlockId(blockId);
}
+ /**
+ * 鑾峰彇鐗囧尯銆佸垎姘存埧鑱斿姩瑙嗗浘锛屾坊鍔犲啘鎴锋椂浣跨敤
+ * @return
+ */
+ public JSONArray getBlockDivides() {
+ JSONArray array_blocks = null;
+ JSONArray array_divides = null;
+ JSONArray array_result = new JSONArray();
+
+ List<BaBlock> list_blocks = dao.selectAll();
+ if(list_blocks != null && list_blocks.size() > 0) {
+ array_blocks = (JSONArray) JSON.toJSON(list_blocks);
+ for (int i = 0; i < array_blocks.size(); i++) {
+ JSONObject job_block = array_blocks.getJSONObject(i);
+ JSONObject job_blockNew = new JSONObject();
+ job_blockNew.put("value", job_block.getLong("id"));
+ job_blockNew.put("label", job_block.getString("name"));
+
+ List<VoSimpleDivide> list_divides = Optional.ofNullable( prDivideMapper.getDividesByBlockId(job_block.getLong("id"))).orElse(new ArrayList<>());
+ array_divides = (JSONArray) JSON.toJSON(list_divides);
+ job_blockNew.put("children", array_divides);
+ array_result.add(job_blockNew);
+ }
+ return array_result;
+ }else {
+ return new JSONArray();
+ }
+ }
}
--
Gitblit v1.8.0