From 18127822f3cdb4778fb62ba0304bb8372dada516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 17 十二月 2025 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index 54acd57..ec7ca40 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -1,11 +1,13 @@
package com.fzzy.sys.manager.common;
import com.fzzy.igds.constant.DepotType;
+import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.DicService;
+import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -35,7 +37,8 @@
private DicService dicService;
@Resource
private CoreDeptService coreDeptService;
-
+ @Autowired
+ private SecCameraService secCameraService;
@Resource
private ISysUserService userService;
@Resource
@@ -140,4 +143,15 @@
user.setDeptId(Long.valueOf(ContextUtil.subDeptId(null)));
return userService.selectUserList(user);
}
+
+
+ /**
+ * 鑾峰彇璁惧鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+ */
+ public List<Camera> listCameraData() {
+ return secCameraService.listCamera(ContextUtil.getCompanyId(),ContextUtil.subDeptId(null));
+ }
}
--
Gitblit v1.9.3