Merge remote-tracking branch 'origin/master'

sgj

18 小时以前 18127822f3cdb4778fb62ba0304bb8372dada516

 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));
    }
}