From 0d59d664b3b81e9264df6ad513d06b1b2c84c931 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 11:43:34 +0800
Subject: [PATCH] 大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index b30a1ee..35fc6d2 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -13,14 +13,12 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -695,4 +693,53 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, resultListSnap);
}
+
+
+ /**
+ * 澶у睆棣栭〉-鎶撴媿璺熻釜淇℃伅-灞曠ずAI鏃堕棿鍥剧墖
+ * 灞曠ず鍥剧墖鐨勪笟鍔￠�昏緫锛氭瘡涓簱鍖哄睍绀轰竴寮狅紝鍥剧墖涓哄綋澶╁崄鐐逛互鍚庢渶鏂扮殑涓�寮�
+ * @param param
+ * @return
+ */
+ public PageResponse<List<EventInfo>> indexEventInfoList(IgdsBaseParam param) {
+// Date start =DateUtils.setHours(DateUtil.getNewByDay(new Date(), -3), 10);
+ //param.setStart(start);
+// param.setEnd(DateUtil.getNewByDay(new Date(), -3));
+ Date start =DateUtils.setHours(new Date(), 10);
+ param.setStart(start);
+ param.setEnd(new Date());
+ //鑾峰彇褰撴棩鐨勬姄鎷嶄俊鎭�
+ List<EventInfo> listByParam = eventInfoService.getListByParam(param);
+ if (null == listByParam || listByParam.isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_0000, new ArrayList<>());
+ }
+ //绛涢�塼ime澶т簬Start鏃堕棿鐨勬暟鎹�
+ listByParam = listByParam.stream().filter(info -> info.getTime().after(start)).collect(Collectors.toList());
+
+ //鑾峰彇鎵�鏈夌殑搴撳尯淇℃伅
+ List<Dept> deptList = deptService.getDeptByUserType(null);
+ //鏍规嵁搴撳尯浠巐istByParam鏉ヨ幏鍙栨瘡涓�涓簱鍖轰笅锛屾渶鏂扮殑涓�寮犳姄鎷嶅浘鐗�
+ List<EventInfo> resultList = new ArrayList<>();
+
+ for (Dept dept : deptList) {
+ EventInfo latestEvent = null;
+ //浠巐istByParam涓瓫閫夊嚭涓庡綋鍓峣d鍖归厤鐨勬暟鎹�
+ List<EventInfo> collect = listByParam.stream().filter(info -> info.getDeptId().equals(dept.getId())).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ //鏍规嵁鏃堕棿鎺掑簭骞舵壘鍒版渶鏂颁竴鏉℃暟鎹�
+ latestEvent = collect.stream().sorted(Comparator.comparing(EventInfo::getTime).reversed()).findFirst().get();
+ }
+ if (latestEvent != null) {
+ resultList.add(latestEvent);
+ }
+ }
+ if (null != resultList && !resultList.isEmpty()) {
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ for (EventInfo record : resultList) {
+ record.setImgName(commonManager.isImgExit(record.getImgName(), null));
+ }
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, resultList);
+ }
}
--
Gitblit v1.9.3