From 645e5448919612d5772d74d29fb2f2bb2f9bf951 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 04 八月 2025 16:11:06 +0800
Subject: [PATCH] 调整数据存储
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java | 4 ++--
cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java | 10 +++++++++-
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 3 ++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
index 6e51c4c..763ac61 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
@@ -39,7 +39,15 @@
// return ResponseEntity.internalServerError().body("鏁版嵁澶勭悊澶辫触: " + e.getMessage());
// }
if(Objects.nonNull(weightRequest) && CollectionUtil.isNotEmpty(weightRequest.getWeights())){
- RedisUtil.lSet(WeightRequestDto.DENSITY,weightRequest.getWeights());
+ List<?> objectList = RedisUtil.lGet(WeightRequestDto.DENSITY, 0, -1);
+ if(CollectionUtil.isNotEmpty(objectList)){
+ // 鍒犻櫎 Redis 涓棫鐨勫垪琛ㄦ暟鎹�
+ RedisUtil.del(WeightRequestDto.DENSITY);
+ // 瀛樺叆鏂扮殑鏁版嵁
+ RedisUtil.lSet(WeightRequestDto.DENSITY, weightRequest.getWeights());
+ }else {
+ RedisUtil.lSet(WeightRequestDto.DENSITY,weightRequest.getWeights());
+ }
return Result.success(null,"淇濆瓨鎴愬姛");
}
return Result.fail();
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 2801da1..281b5fa 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -190,7 +190,8 @@
numberOfDataEntries.addAndGet(1);
}else {
// 浠� Redis 涓幏鍙栧垪琛ㄦ暟鎹�
- List<Object> objectList = RedisUtil.lGet(refery, 0, -1);
+// List<Object> objectList = RedisUtil.lGet(refery, 0, -1);
+ List<?> objectList = RedisUtil.lGet(refery, 0, -1);
for (Object item : objectList) {
// System.out.println(item);
String[] split = item.toString().replace("[","").replace("]","").split(",");
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
index ed0d3ae..664ec0b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
@@ -471,7 +471,7 @@
* @param start 寮�濮�
* @param end 缁撴潫 0 鍒� -1浠ｈ〃鎵�鏈夊��
*/
- public static List<Object> lGet(String key, long start, long end) {
+ public static List<?> lGet(String key, long start, long end) {
try {
return redisTemplate.opsForList().range(key, start, end);
} catch (Exception e) {
@@ -557,7 +557,7 @@
* @param value 鍊�
* @return true 瀛樻斁鎴愬姛 false瀛樻斁澶辫触
*/
- public static boolean lSet(String key, List<Object> value) {
+ public static boolean lSet(String key, List<?> value) {
try {
redisTemplate.opsForList().rightPushAll(key, value);
return true;
--
Gitblit v1.9.3