From fc993472ae3b57e5b00f6a4e4e3277ec48df0baa Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 17 六月 2023 08:51:15 +0800
Subject: [PATCH] 增加只获取部门下的三维实景
---
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java | 1 +
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java | 7 +++++++
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java | 6 +++---
4 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
index 64ca2e6..7a82f00 100644
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
@@ -116,4 +116,11 @@
Map deptAndTiles3d = ardTiles3dService.getChildDeptAndTiles3d();
return AjaxResult.success(deptAndTiles3d);
}
+ @GetMapping("/getChildTiles3d")
+ @ApiOperation("鑾峰彇涓夌淮瀹炴櫙")
+ public AjaxResult getChildTiles3d()
+ {
+ Map deptAndTiles3d = ardTiles3dService.getChildTiles3d();
+ return AjaxResult.success(deptAndTiles3d);
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
index f87a18e..9011c01 100644
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
@@ -73,7 +73,7 @@
/** 閮ㄩ棬id */
@Excel(name = "閮ㄩ棬id")
- private Integer deptId;
+ private Long deptId;
/** 鐢ㄦ埛id */
@Excel(name = "鐢ㄦ埛id")
@@ -205,12 +205,12 @@
{
return dynamicScreenSpaceErrorDensity;
}
- public void setDeptId(Integer deptId)
+ public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
- public Integer getDeptId()
+ public Long getDeptId()
{
return deptId;
}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java
index 520b372..0c4afa1 100644
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java
@@ -62,4 +62,5 @@
public int deleteArdTiles3dByTilesId(String tilesId);
public Map getChildDeptAndTiles3d();
+ public Map getChildTiles3d();
}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java
index 01d8fa1..29609e4 100644
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java
@@ -115,6 +115,14 @@
return map;
}
+ @Override
+ public Map getChildTiles3d() {
+ Long deptId = SecurityUtils.getDeptId();
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ Map<String, Object> map = fetchChildtiles3d(sysDept);
+ return map;
+ }
+
/**
* @鎻忚堪 閫掑綊鏌ヨ
* @鍙傛暟 [sysDept]
@@ -153,4 +161,34 @@
return map;
}
+ /**
+ * @鎻忚堪 閫掑綊鏌ヨ-鍙幏鍙栦笁缁村疄鏅�
+ * @鍙傛暟 [sysDept]
+ * @杩斿洖鍊� java.util.Map<java.lang.String, java.lang.Object>
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/2 14:38
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+
+ public Map<String, Object> fetchChildtiles3d(SysDept sysDept) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", sysDept.getDeptName());
+ map.put("deptId", sysDept.getDeptId());
+ map.put("disabled", true);
+ ArdTiles3d ardTiles3d=new ArdTiles3d();
+ ardTiles3d.setDeptId(sysDept.getDeptId());
+ List<ArdTiles3d> ardTiles3ds = ardTiles3dMapper.selectArdTiles3dList(ardTiles3d);
+ List<Object> childList = new ArrayList<>();
+ if (ardTiles3ds.size() > 0) {
+ for (ArdTiles3d tiles3d : ardTiles3ds) {
+ Map<String, Object> tiles3dMap = ArdTool.convertEntityToMap(tiles3d);
+ String value =(String) tiles3dMap.get("tilesName");
+ tiles3dMap.remove("tilesName");
+ tiles3dMap.put("name",value);
+ childList.add(tiles3dMap);
+ }
+ }
+ map.put("children", childList);
+ return map;
+ }
}
--
Gitblit v1.9.3