From 4aa86f1386d20c9ad811e2d18b7e56f00b06e25c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 15 六月 2023 16:51:55 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index 6ebfb97..4335379 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -1,13 +1,19 @@
package com.ruoyi.device.camera.service.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.system.mapper.SysDeptMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -22,6 +28,8 @@
public class ArdCamerasServiceImpl implements IArdCamerasService {
@Resource
private ArdCamerasMapper ardCamerasMapper;
+ @Resource
+ private SysDeptMapper sysDeptMapper;
/**
* 鏌ヨ鐩告満璁惧
@@ -108,4 +116,58 @@
public List findOptions(ArdCameras ardCameras) {
return ardCamerasMapper.findOptions(ardCameras);
}
+
+ /**
+ * @鎻忚堪 鑾峰彇鏈儴闂ㄤ互涓嬬殑鎵�鏈夌浉鏈哄拰閮ㄩ棬
+ * @鍙傛暟 []
+ * @杩斿洖鍊� java.util.Map
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/2 10:58
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+
+ @Override
+ public Map getChildDeptAndCamera() {
+ Long deptId = SecurityUtils.getDeptId();
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ Map<String, Object> map = fetchChildDepartments(sysDept);
+ return map;
+ }
+ /**
+ * @鎻忚堪 閫掑綊鏌ヨ
+ * @鍙傛暟 [sysDept]
+ * @杩斿洖鍊� java.util.Map<java.lang.String,java.lang.Object>
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/2 14:38
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public Map<String, Object> fetchChildDepartments(SysDept sysDept) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", sysDept.getDeptName());
+ map.put("deptId", sysDept.getDeptId());
+ map.put("disabled", true);
+ List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptById(sysDept.getDeptId());
+ List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
+ List<Object> childList = new ArrayList<>();
+ for (SysDept childDept : sysDepts) {
+ Map<String, Object> childMap = new HashMap<>();
+ childMap.put("name", childDept.getDeptName());
+ childMap.put("deptId", childDept.getDeptId());
+ childMap.put("disabled", true);
+ Map<String, Object> map1 = fetchChildDepartments(childDept);
+ childMap.putAll(map1);
+ childList.add(childMap);
+ }
+ if (ardCameras.size() > 0) {
+ for (ArdCameras camera : ardCameras) {
+ Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
+ childList.add(cameraMap);
+ }
+ }
+ map.put("children", childList);
+ return map;
+
+ }
+
+
}
--
Gitblit v1.9.3