From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 c51a6d2..baa81b5 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
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -103,7 +104,7 @@
String viewUrl = prefix + "/video-webrtc";
- //WEB-RTC澶у崕鎾斁
+ //WEB-RTC鎾斁
if (CameraPlayType.PLAY_TYPE_WEB_RTC.getCode().equals(playType)) {
viewUrl = prefix + "/video-webrtc";
}
@@ -124,4 +125,32 @@
return secManager.updatePos(params);
}
+
+
+ /**
+ * 棣栭〉鎬昏
+ *
+ * @return
+ */
+ @RequestMapping("/quantity")
+ public String infrared(
+ @RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ String deptId = ContextUtil.subDeptId(user);
+ view.put("deptId", deptId);
+// List<InfraredCamera> listCamera = infraredManager.listCamera(deptId, user.getCompanyId());
+//
+// if(null == listCamera){
+// listCamera = new ArrayList<>();
+// listCamera.add(new InfraredCamera());
+// }
+// view.put("listCamera", listCamera);
+
+ return prefix + "/quantity";
+ }
+
}
--
Gitblit v1.9.3