From 6842af1dcf0658a01139451fbee142dfa051f2ec Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 30 三月 2026 15:07:02 +0800
Subject: [PATCH] 大屏首页轮播图改为每个库区十天内最新的三张图片

---
 fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
index 7df183d..d33af21 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
@@ -1,5 +1,6 @@
 package com.fzzy.security;
 
+import com.fzzy.common.manager.CommonManager;
 import com.fzzy.igds.camera.data.ApiCameraData;
 import com.fzzy.igds.camera.data.ApiCameraResp;
 import com.fzzy.igds.constant.CameraPlayType;
@@ -12,15 +13,18 @@
 import com.fzzy.igds.response.BaseResponse;
 import com.fzzy.igds.utils.ContextUtil;
 import com.fzzy.igds.utils.SystemUtil;
-import com.fzzy.common.manager.CommonManager;
 import com.fzzy.security.manager.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;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+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;
@@ -246,6 +250,10 @@
         List<QuantityConf> listCamera = secManager.getQuantityConfByDeptId(deptId);
         view.put("listCamera", listCamera);
 
+        //搴撳尯缃戝叧淇℃伅
+        GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+        view.put("gatewaySer", gatewaySer);
+
         return prefix + "/quantity";
     }
 
@@ -346,10 +354,11 @@
      */
     @RequestMapping("/patrol-record")
     public String getPatrolRecordById(@RequestParam(value = "patrolId", required = true) String patrolId,
+                                      @RequestParam(value = "userId", required = true) String userId,
+                                      @RequestParam(value = "confId", required = true) String confId,
                                       ModelMap view) {
-        IgdsBaseParam param = new IgdsBaseParam();
-        param.setKey(patrolId);
-        List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId);
+
+        List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId, userId, confId);
         view.put("patrolRecordList", trackPoints);
 
         return prefix + "/patrol-record";

--
Gitblit v1.9.3