From b8e8195a9cae963e6f59fcd5208698098e03aba8 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 24 三月 2026 15:00:05 +0800
Subject: [PATCH] 主页，近7天抓拍统计改为近7天玉米出库价格统计
---
fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
index 81928d3..4529548 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -2,12 +2,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.common.manager.CommonManager;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.SnapRecord;
+import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.security.manager.SnapRecordManager;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -15,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@@ -23,7 +28,7 @@
@RequestMapping("/security/snap/snapRecord")
public class SnapRecordController {
- private static final String prefix = "security/snap/snapRecord";
+ private static final String prefix = "security";
@Resource
private SnapRecordManager snapRecordManager;
@@ -36,15 +41,32 @@
*/
@GetMapping
public String getSnapRecord(@RequestParam(value = "viewType", required = false) String viewType, Model model) {
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ SysUser user = ContextUtil.getLoginUser();
List<Company> companies = commonManager.listCompanyData();
String defaultCompany = "" ;
if (companies != null && !companies.isEmpty()) {
defaultCompany = companies.get(0).getId();
}
+ //鑾峰彇搴撳尯鏁版嵁
+ List<Dept> depts = new ArrayList<>() ;
+ String defaultDeptId = "" ;
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ depts=commonManager.listDeptData(null);
+ defaultDeptId=user.getDeptId() + "";
+ }else{
+ depts=commonManager.listDeptData(defaultCompany);
+ //鍦ㄩ浣嶆坊鍔犳墍鏈夐�夐」
+ Dept all = new Dept();
+ all.setId("");
+ all.setKqmc("鎵�鏈�");
+ depts.add(0, all);
+ }
IgdsBaseParam param = new IgdsBaseParam();
param.setPage(1);
- param.setLimit(6);
+ param.setLimit(8);
param.setKey(defaultCompany);
+ param.setDeptId(defaultDeptId);
Page<SnapRecord> images = snapRecordManager.pageData(param);
model.addAttribute("snapRecordList", images.getRecords());
model.addAttribute("currentPage", images.getCurrent());
@@ -59,7 +81,8 @@
//璁惧鏁版嵁
model.addAttribute("cameraList", commonManager.listCameraData());
//搴撳尯鏁版嵁
- model.addAttribute("deptList", commonManager.listDeptData(null));
+ model.addAttribute("deptList", depts);
+ model.addAttribute("defaultDeptId", defaultDeptId);
//鍏徃鏁版嵁
model.addAttribute("companyList", companies);
//榛樿鏌ヨ鍏徃鏁版嵁
--
Gitblit v1.9.3