From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配

---
 collect/src/main/java/com/qianwen/mdc/collect/utils/redis/RedisUtil.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/collect/src/main/java/com/qianwen/mdc/collect/utils/redis/RedisUtil.java b/collect/src/main/java/com/qianwen/mdc/collect/utils/redis/RedisUtil.java
index 0c65ff6..41ed786 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/utils/redis/RedisUtil.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/utils/redis/RedisUtil.java
@@ -192,7 +192,7 @@
      * @param time 鏃堕棿(绉�)
      * @return true鎴愬姛 false澶辫触
      */
-    public boolean hmset(String key, Map<String,Object> map, long time){
+    public boolean hmsetold(String key, Map<String,Object> map, long time){
         try {
             redisTemplate.opsForHash().putAll(key, map);
             if (time > 0) {
@@ -204,6 +204,19 @@
             return false;
         }
     }
+    public boolean hmset(String key, Map<? extends Object, ? extends Object> map, long time){
+        try {
+            redisTemplate.opsForHash().putAll(key, map);
+            if (time > 0) {
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+    
 
     /**
      * 鍚戜竴寮爃ash琛ㄤ腑鏀惧叆鏁版嵁,濡傛灉涓嶅瓨鍦ㄥ皢鍒涘缓
@@ -212,7 +225,7 @@
      * @param value 鍊�
      * @return true 鎴愬姛 false澶辫触
      */
-    public boolean hset(String key, String item, Object value) {
+    public boolean hset(String key, Object item, Object value) {
         try {
             redisTemplate.opsForHash().put(key, item, value);
             return true;
@@ -290,7 +303,7 @@
      * @param key 閿�
      * @return
      */
-    public Set<Object> sGet(String key) {
+    public Set<? extends Object> sGet(String key) {
         try {
             return redisTemplate.opsForSet().members(key);
         } catch (Exception e) {

--
Gitblit v1.9.3