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/controller/security/SecurityController.java | 118 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 68 insertions(+), 50 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
index 037aa65..05160e9 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
@@ -1,5 +1,7 @@
package com.fzzy.sys.controller.security;
+import com.fzzy.igds.camera.data.ApiCameraData;
+import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.CameraPlayType;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.PageResponse;
@@ -7,7 +9,10 @@
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.SystemUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.SecManager;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
@@ -18,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -35,17 +41,21 @@
@Resource
private SecManager secManager;
@Resource
+ private CommonManager commonManager;
+ @Resource
private CoreDeptService deptService;
/**
* 搴撳尯瀹夐槻椤甸潰
- * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param deptId
* @param view
* @return
*/
@RequestMapping("/video-dept")
public String videoDept(@RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ @RequestParam(value = "deptId", required = false) String deptId,
+ ModelMap view) {
if (StringUtils.isBlank(type)) {
type = "2";
@@ -54,11 +64,24 @@
SysUser user = ContextUtil.getLoginUser();
view.put(Constant.MODEL_KEY_LOGIN_USER, user);
- String deptId = ContextUtil.subDeptId(user);
+ if(StringUtils.isBlank(deptId)){
+ deptId = ContextUtil.subDeptId(user);
+ }
view.put("deptId", deptId);
List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
view.put("listCamera", listCamera);
+
+ SysDept sysDept = commonManager.getDeptById(deptId);
+ view.put("dept", sysDept);
+ view.put("type", type);
+
+ //鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
+ String showDeptList = "Y";
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ showDeptList = "N";
+ }
+ view.put("showDeptList", showDeptList);
//榛樿鐩戞帶鍒楄〃椤甸潰
String viewUrl = prefix + "/video-list-dept";
@@ -66,53 +89,7 @@
if("1".equals(type)){
viewUrl = prefix + "/video-aerial-dept";
- //楦熺灠鍥�
- Dept dept = deptService.getDeptById(deptId);
- if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
- view.put("backgroundImg", dept.getImgPath());
- }
- }
- if("2".equals(type)){
- viewUrl = prefix + "/video-list-dept";
- }
-
- return viewUrl;
- }
-
- /**
- * 鐩戠瀹夐槻椤甸潰
- * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
- * @param view
- * @return
- */
- @RequestMapping("/video-super")
- public String videoSuper(@RequestParam(value = "type", required = false) String type,
- ModelMap view) {
-
- if (StringUtils.isBlank(type)) {
- type = "2";
- }
-
- SysUser user = ContextUtil.getLoginUser();
- view.put(Constant.MODEL_KEY_LOGIN_USER, user);
-
- String deptId = ContextUtil.subDeptId(user);
- view.put("deptId", deptId);
-
- List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
- view.put("listCamera", listCamera);
-
- //榛樿鐩戞帶鍒楄〃椤甸潰
- String viewUrl = prefix + "/video-list-dept";
-
- if("1".equals(type)){
- viewUrl = prefix + "/video-aerial-dept";
-
- //楦熺灠鍥�
- Dept dept = deptService.getDeptById(deptId);
- if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
- view.put("backgroundImg", dept.getImgPath());
- }
+ view.put("backgroundImg", commonManager.getDeptImg(deptId));
}
if("2".equals(type)){
viewUrl = prefix + "/video-list-dept";
@@ -159,6 +136,47 @@
return viewUrl;
}
+ /**
+ * 鑾峰彇瑙嗛鎾斁鍦板潃
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/get-media")
+ @ResponseBody
+ public ApiCameraResp getMedia(HttpServletRequest request, @RequestBody Camera param) {
+ //鑾峰彇璇锋眰鏂笽P
+ String ip = SystemUtil.getIP(request);
+ return secManager.getPlayAddr(param, ip);
+ }
+
+ /**
+ * 瑙嗛浜戝彴鎺у埗锛屾墍鏈夌被鍨嬬殑浜戝彴鎺у埗鍏ュ彛
+ *
+ * @param param 鍓嶇杞崲鐨勫弬鏁�
+ * @return 鎵ц缁撴灉
+ */
+ @RequestMapping("/ptz-media")
+ @ResponseBody
+ public ApiCameraResp ptzMedia(@RequestBody ApiCameraData param) {
+
+ //log.debug("-----浜戝彴璋冪敤-----{}",param);
+ return secManager.ptzMedia(param);
+ }
+
+
+ /**
+ * 瑙嗛浜戝彴棰勭疆浣嶈缃�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/ptz-preset")
+ @ResponseBody
+ public ApiCameraResp ptzPreset(@RequestBody ApiCameraData param) {
+ return secManager.ptzPreset(param);
+ }
+
/***
* 瑙嗛楦熺灠鍥句腑鏇存敼鎽勫儚澶翠綅缃�
*
--
Gitblit v1.9.3