From ac87f61568a68501aa50d5c3f0d083e8ea36ebb3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 29 十一月 2024 14:33:07 +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 | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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 47438b6..2c67b73 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;
/**
* 寰楀埌涓�涓墖鍖�
@@ -83,7 +90,7 @@
* @return
*/
public QueryResultVo<List<VoBlock>> getBlocks(QueryVo vo){
- vo.setPageCurr((vo.pageCurr -1) * vo.pageSize);
+ vo.setPageCurr((vo.getPageCurr() -1) * vo.getPageSize());
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
Long itemTotal = this.dao.getBlocksCount(params) ;
@@ -127,6 +134,9 @@
job_block.put("graphs", array_mapGraphs);
}
}
+ }else {//澧炲姞鍋ュ．鎬�
+ QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
+ return rsVo ;
}
QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
@@ -209,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").toString());
+ 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