From 55a4112533c958492078a5a94c90667e6cf5969c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 13 四月 2024 10:39:22 +0800
Subject: [PATCH] 修改获取附近车辆bug 修改默认所有相机启动引导队列
---
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
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 820612d..28f340b 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
import com.ruoyi.management3d.tiles3d.mapper.ArdTiles3dMapper;
@@ -64,6 +65,7 @@
*/
@Override
public int insertArdTiles3d(ArdTiles3d ardTiles3d) {
+ ardTiles3d.setTilesId(IdUtils.simpleUUID());
ardTiles3d.setUserId(SecurityUtils.getUserId());
ardTiles3d.setCreateBy(SecurityUtils.getUsername());
ardTiles3d.setCreateTime(DateUtils.getNowDate());
@@ -104,7 +106,11 @@
public int deleteArdTiles3dByTilesId(String tilesId) {
return ardTiles3dMapper.deleteArdTiles3dByTilesId(tilesId);
}
-
+ /**
+ * 鑾峰彇閮ㄩ棬鍜屼笁缁村疄鏅�
+ *
+ * @return 缁撴灉
+ */
@Override
public Map getChildDeptAndTiles3d() {
Long deptId = SecurityUtils.getDeptId();
@@ -112,9 +118,21 @@
Map<String, Object> map = fetchChildDepartments(sysDept);
return map;
}
+ /**
+ * 鍙幏鍙栦笁缁村疄鏅�
+ *
+ * @return 缁撴灉
+ */
+ @Override
+ public Map getChildTiles3d() {
+ Long deptId = SecurityUtils.getDeptId();
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ Map<String, Object> map = fetchChildtiles3d(sysDept);
+ return map;
+ }
/**
- * @鎻忚堪 閫掑綊鏌ヨ
+ * @鎻忚堪 閫掑綊鏌ヨ-鑾峰彇閮ㄩ棬鍜屼笁缁村疄鏅�
* @鍙傛暟 [sysDept]
* @杩斿洖鍊� java.util.Map<java.lang.String, java.lang.Object>
* @鍒涘缓浜� 鍒樿嫃涔�
@@ -140,12 +158,45 @@
}
if (ardTiles3ds.size() > 0) {
for (ArdTiles3d tiles3d : ardTiles3ds) {
- Map<String, Object> cameraMap = ArdTool.convertEntityToMap(tiles3d);
- childList.add(cameraMap);
+ 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;
}
+ /**
+ * @鎻忚堪 閫掑綊鏌ヨ-鍙幏鍙栦笁缁村疄鏅�
+ * @鍙傛暟 [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