From a2a790968bc8479dda1dec878068da865662889e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 10:26:58 +0800
Subject: [PATCH] 1、完善代码；
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 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 11a0410..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) ;
@@ -93,12 +100,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,17 +121,22 @@
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);
}
}
}
// 灏嗗湴鍥惧浘褰㈡暟缁勬坊鍔犲埌鐗囧尯涓�
if(array_mapGraphs != null && array_mapGraphs.size() > 0) {
- job_block.put("graph", array_mapGraphs);
+ job_block.put("graphs", array_mapGraphs);
}
}
+ }else {//澧炲姞鍋ュ．鎬�
+ QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
+ return rsVo ;
}
QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
@@ -188,4 +201,50 @@
return po.getId();
};
+ /**
+ * 鏍规嵁鐗囧尯ID鍒犻櫎鍦板浘鍥惧舰
+ * @param blockId
+ * @return
+ */
+ public int deleteMapGraph(Long blockId) {
+ return this.baMapGraphMapper.deleteByBlockId(blockId);
+ }
+
+ /**
+ * 鏍规嵁鐗囧尯ID鍒犻櫎璇ョ墖鍖轰笅鐨勫潗鏍囩偣
+ * @param blockId
+ * @return
+ */
+ public int deleteMapCoordinates(Long blockId) {
+ 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