From 86e7cce6159d6d74bcc636327939ec9ea8d3009d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 21 二月 2025 14:15:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 7 +++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 1 +
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 6 ++++--
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java | 31 ++++++++++++++++++++++++++-----
5 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 5f3b6cd..018e6fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -211,7 +211,8 @@
list.add(serviceSubtask2.getId().toString());
}
log.error("缂撳瓨涓璫ache-0鐨勫�间负锛歿}", list);
- redisCache.setCacheListLeft("cache-0", list);
+// redisCache.setCacheListLeft("cache-0", list);
+ redisCache.setCacheListLeftAndDistinct("cache-0", list);
} else {
//闈炵珛鍗冲彂閫�
ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
@@ -221,7 +222,8 @@
for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
list.add(serviceSubtask2.getId().toString());
}
- redisCache.setCacheListLeft(key, list);
+// redisCache.setCacheListLeft(key, list);
+ redisCache.setCacheListLeftAndDistinct(key, list);
}
} catch (Exception exception) {
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 78f9c77..045aaf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index 8665654..5eecedc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -1,11 +1,8 @@
package com.ruoyi.common.core.redis;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.*;
@@ -142,6 +139,30 @@
}
/**
+ * 缂撳瓨List鏁版嵁
+ *
+ * @param cacheKey 缂撳瓨鐨勯敭鍊�
+ * @param list 寰呯紦瀛樼殑List鏁版嵁(杩欓噷濡傛灉鏂板鐨勮瘽锛屾槸寰�澶撮儴鏂板)骞跺幓閲�
+ * @return 缂撳瓨鐨勫璞�
+ */
+ public void setCacheListLeftAndDistinct(String cacheKey, List<String> list) {
+ // 鑾峰彇 ListOperations 瀵硅薄锛岀敤浜庢搷浣� Redis List
+ ListOperations<String, String> listOps = redisTemplate.opsForList();
+
+ // 鑾峰彇鐜版湁鐨� cache-0 鍒楄〃涓殑鎵�鏈夊��
+ List<String> existingValues = listOps.range(cacheKey, 0, -1);
+
+ // 杩囨护鍑轰笉鍦� Redis 鍒楄〃涓殑鍊�
+ List<String> newValues = list.stream().filter(value -> !existingValues.contains(value)).collect(Collectors.toList());
+
+ // 灏嗘柊鐨勫�兼坊鍔犲埌 Redis 鍒楄〃鐨勫乏渚�
+ if (!newValues.isEmpty()) {
+ listOps.leftPushAll(cacheKey, newValues);
+ }
+ }
+
+
+ /**
* 鑾峰緱缂撳瓨鐨刲ist瀵硅薄
*
* @param key 缂撳瓨鐨勯敭鍊�
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index eaec792..f4f271c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -312,9 +312,7 @@
List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
// 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
- List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream()
- .sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime())))
- .collect(Collectors.toList());
+ List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
if (descByCode.equals("鐢佃瘽")) {
String value = "";
@@ -351,7 +349,8 @@
}
//灏嗚鎵ц鐨勬斁鍒扮紦瀛樹腑
if (list.size() > 0) {
- redisCache.setCacheListLeft("cache-0", list);
+// redisCache.setCacheListLeft("cache-0", list);
+ redisCache.setCacheListLeftAndDistinct("cache-0", list);
}
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 56fff07..cbfbd00 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1858,6 +1858,7 @@
//鏃犱汉鎺ュ惉
getSmsCompensate(Long.valueOf(phoneCallRecordVO.getTaskid()));
redisCache.deleteObject(phoneCallRecordVO.getTaskid() + "recordAccept-hungup");
+ redisCache.removeElementFromList("cache-exist", phoneCallRecordVO.getTaskid());
} else if (ObjectUtils.isNotEmpty(cacheObject) && String.valueOf(cacheObject).equals("2")) {
// if (phoneCallRecordVO.getAnswered() != null && phoneCallRecordVO.getAnswered() == true) {
log.error("鏈変汉鎺ョ數璇濅簡锛屽苟涓斿畬浜�");
--
Gitblit v1.9.3