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-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java | 82 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
index 835baad..7139b81 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GatewaySerService.java
@@ -53,6 +53,7 @@
if (StringUtils.isNotBlank(parentId)) {
queryWrapper.likeRight("dept_id", parentId);
}
+ queryWrapper.orderByAsc("order_num");
return gatewaySerMapper.selectList(queryWrapper);
}
@@ -139,10 +140,9 @@
if(isUpdateTime){
//蹇冭烦鏃堕棿
- ser.setHeartbeatTime(new Date());
+ ser.setUpdateTime(new Date());
}
- ser.setUpdateTime(new Date());
ser.setStatus(status);
gatewaySerMapper.updateById(ser);
@@ -159,7 +159,58 @@
//鍒犻櫎缂撳瓨
delCache(ser);
+ }
+ /**
+ * 鑾峰彇缁勭粐涓嬫墍鏈夌綉鍏充俊鎭�
+ * @param companyId
+ * @return
+ */
+ public List<GatewaySer> getCacheSer(String companyId) {
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
+
+ List<GatewaySer> result = new ArrayList<>();
+ String patten = RedisConst.buildKey(companyId, RedisConst.KEY_GATEWAY_SER_LIST) + "*";
+ Collection<String> keys = redisCache.keys(patten);
+ if (null != keys) {
+ for (String key : keys) {
+ result.add((GatewaySer) redisCache.getCacheObject(key));
+ }
+ }
+ if(result.isEmpty()){
+ result = getAllSer();
+ this.setCacheSer(result);
+ }
+ return result;
+ }
+
+ /**
+ * 鏍规嵁鍒嗘満ID鑾峰彇鍒嗘満淇℃伅
+ *
+ * @param deptId
+ * @return
+ */
+ public GatewaySer getCacheSerByDeptId(String deptId) {
+ if (StringUtils.isEmpty(deptId)) {
+ return null;
+ }
+
+ String patten = RedisConst.buildKey(ContextUtil.getCompanyId(), RedisConst.KEY_GATEWAY_SER_LIST) + "*";
+ Collection<String> keys = redisCache.keys(patten);
+ if (null == keys) {
+ return null;
+ }
+
+ GatewaySer ser = null;
+ for (String key : keys) {
+ ser = (GatewaySer) redisCache.getCacheObject(key);
+ if(deptId.equals(ser.getDeptId())){
+ return ser;
+ }
+ }
+ return null;
}
/**
@@ -176,26 +227,27 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
+
+ GatewaySer result = null;
+ GatewaySer ser = null;
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_GATEWAY_SER_LIST) + "*";
Collection<String> keys = redisCache.keys(patten);
- if (null == keys) {
- return null;
- }
-
- GatewaySer ser = null;
- for (String key : keys) {
- ser = (GatewaySer) redisCache.getCacheObject(key);
- if(id.equals(ser.getId())){
- break;
+ if (null != keys && !keys.isEmpty()) {
+ for (String key : keys) {
+ ser = (GatewaySer) redisCache.getCacheObject(key);
+ if(id.equals(ser.getId())){
+ result = ser;
+ break;
+ }
}
}
- if(null == ser){
- ser = getById(id);
- this.setCacheSer(ser);
+ if(null == result){
+ result = getById(id);
+ this.setCacheSer(result);
}
- return ser;
+ return result;
}
/**
--
Gitblit v1.9.3