From 880d2fb2f1082ed63b3f21259710ed683b14ae51 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 02 四月 2025 10:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index ae517cd..353c9d1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -452,11 +452,16 @@
@Override
public Map<Integer, List<BigStorageVO>> querybigStorageCageDetail() {
- List<BigStorageVO> bigStorageCages= baseMapper.querybigStorageCageDetail();
+ List<BigStorageVO> bigStorageCages = baseMapper.querybigStorageCageDetail();
return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
}
@Override
+ public boolean cancelTemperingTask() {
+ return false;
+ }
+
+ @Override
public String temperingSwitch(Boolean flag) {
redisUtil.setCacheObject("temperingSwitch", flag);
return "success";
--
Gitblit v1.8.0