RedisUtils 工具类验证完成，分环境设定定时任务

Signed-off-by: TanYibin <5491541@qq.com>

RedisUtils 工具类验证完成，分环境设定定时任务
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent bdc81be6
Showing 6 changed files with 112 additions and 122 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/TestController.java
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengRedisUtil.java
huaheng-wms-core/src/main/resources/application-dev.yml
huaheng-wms-core/src/main/resources/application-prod.yml
huaheng-wms-core/src/main/resources/application-test.yml
@@ -31,7 +31,7 @@ public class SendMsgJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
  
-        log.info(String.format("Jeecg-Boot 发送消息任务 SendMsgJob!时间:" + DateUtils.getTimestamp()));
+        log.info(String.format("Jeecg-Boot 发送消息任务 SendMsgJob 开始 时间:" + DateUtils.getTimestamp()));
  
         // 1.读取消息中心数据，只查询未发送的和发送失败不超过次数的
         QueryWrapper<SysMessage> queryWrapper = new QueryWrapper<SysMessage>();
@@ -66,7 +66,7 @@ public class SendMsgJob implements Job {
             // 发送结果回写到数据库
             sysMessageService.updateById(sysMessage);
         }
-        log.info(String.format("Jeecg-Boot 发送消息任务 SendMsgJob 结束"));
+        log.info(String.format("Jeecg-Boot 发送消息任务 SendMsgJob 结束  时间:" + DateUtils.getTimestamp()));
     }
  
 }
 package org.jeecg.modules.wms.framework.controller;
  
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
  
 import javax.servlet.http.HttpServletRequest;
  
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.utils.HuahengRedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
  
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
  
 import lombok.extern.slf4j.Slf4j;
  
@@ -31,15 +34,69 @@ public class TestController extends HuahengBaseController {
     @Autowired
     private HuahengRedisUtil redisUtil;
  
-    @AutoLog(value = "TestController-testRedis")
+//    @AutoLog(value = "TestController-testRedis")
     @ResponseBody
     @PostMapping(value = "/testRedis")
-    public Result<?> testRedis(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
+    public Result<?> testRedis(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws InterruptedException {
  
-        log.info(JSON.toJSONString(paramMap));
-        redisUtil.set("testKey", "testValue");
-        String result = redisUtil.get("testKey");
-        log.info("redisUtil.get -> " + result);
-        return Result.OK(result);
+//        log.info(JSON.toJSONString(paramMap));
+        String key = "testKey";
+        Map<String, ReceiptHeader> receiptHeaderMap = new ConcurrentHashMap<String, ReceiptHeader>();
+        ReceiptHeader value = new ReceiptHeader();
+        value.setCode("11111111111");
+        receiptHeaderMap.put("receiptHeader1", value);
+        redisUtil.set(key, receiptHeaderMap);
+//        Map<String, ReceiptHeader> result = redisUtil.get(key, new TypeReference<Map<String, ReceiptHeader>>() {});
+//        log.info("redisUtil.get -> " + JSON.toJSONString(result));
+//        Long rxpireTime = redisUtil.getExpire(key);
+//        log.info("rxpireTime -> " + rxpireTime);
+//        redisUtil.expire(key, 100);
+//        rxpireTime = redisUtil.getExpire(key);
+//        log.info("rxpireTime -> " + rxpireTime);
+//        value.setCode("2222222222222222");
+        redisUtil.delete(key);
+        Map<String, ReceiptHeader> result = redisUtil.getAndSet(key, receiptHeaderMap, new TypeReference<Map<String, ReceiptHeader>>() {}, 10);
+        Long rxpireTime = redisUtil.getExpire(key);
+        log.info("redisUtil.get -> {} rxpireTime -> {}", JSON.toJSONString(result), rxpireTime);
+        
+        Thread.sleep(2000l);
+        result = redisUtil.get(key, new TypeReference<Map<String, ReceiptHeader>>() {});
+        rxpireTime = redisUtil.getExpire(key);
+        log.info("redisUtil.get sleep 2s -> {} rxpireTime -> {}", JSON.toJSONString(result), rxpireTime);
+
+        Long count = redisUtil.decr("countKey", 10);
+         rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey decr count -> {} rxpireTime -> {}", count, rxpireTime);
+        count = redisUtil.decr("countKey", 100);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey decr count -> {} rxpireTime -> {}", count, rxpireTime);
+        
+        Thread.sleep(2000l);
+        count = redisUtil.get("countKey", Long.class);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey sleep 2s count -> {} rxpireTime -> {}", count, rxpireTime);
+        
+        
+        count = redisUtil.incr("countKey", 120);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey incr count -> {}  rxpireTime -> {}", count, rxpireTime);
+        count = redisUtil.incr("countKey", 140);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey incr count -> {}  rxpireTime -> {}", count, rxpireTime);
+        
+        Thread.sleep(2000l);
+        count = redisUtil.get("countKey", Long.class);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey sleep 2s get -> {} rxpireTime -> {}", count, rxpireTime);
+        log.info("countKey hasKey -> {}",redisUtil.hasKey("countKey"));
+        
+        Thread.sleep(10000l);
+        count = redisUtil.get("countKey", Long.class);
+        rxpireTime = redisUtil.getExpire("countKey");
+        log.info("countKey sleep 10s get -> {} rxpireTime -> {}", count, rxpireTime);
+        log.info("countKey hasKey -> {}",redisUtil.hasKey("countKey"));
+        
+
+        return Result.OK(count);
     }
 }
@@ -44,10 +44,6 @@ public class HuahengRedisUtil {
         return JSON.parseObject(jsonString, type);
     }
  
-    public static <T> List<T> fromJsonList(String jsonString, Class<T> cls) {
-        return JSON.parseArray(jsonString, cls);
-    }
-
     /**
      * 将key中存储值的整数值递增 1
      * @author             TanYibin
@@ -59,7 +55,9 @@ public class HuahengRedisUtil {
     public Long incr(@Nonnull String key, @Nonnull Integer seconds) {
         try {
             Long returnValue = redisTemplate.opsForValue().increment(key);
-            redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
+            if (returnValue.equals(1l)) {
+                redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
+            }
             return returnValue;
         } catch (Exception e) {
             log.error("操作缓存异常：key:{}", key, e);
@@ -74,9 +72,13 @@ public class HuahengRedisUtil {
      * @param      key
      * @return
      */
-    public Long decr(@Nonnull String key) {
+    public Long decr(@Nonnull String key, @Nonnull Integer seconds) {
         try {
-            return redisTemplate.opsForValue().decrement(key);
+            Long returnValue = redisTemplate.opsForValue().decrement(key);
+            if (returnValue.equals(-1l)) {
+                redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
+            }
+            return returnValue;
         } catch (Exception e) {
             log.error("操作缓存异常：key:{}", key, e);
         }
@@ -137,6 +139,34 @@ public class HuahengRedisUtil {
         return null;
     }
  
+    public <T> T getAndSet(@Nonnull String key, @Nonnull T value, @Nonnull TypeReference<T> type) {
+        try {
+            String jsonString = redisTemplate.opsForValue().getAndSet(key, toJson(value));
+            redisTemplate.expire(key, 7200, TimeUnit.SECONDS);
+            if (StringUtils.isEmpty(jsonString)) {
+                return null;
+            }
+            return fromJson(jsonString, type);
+        } catch (Exception e) {
+            log.error("操作缓存异常：key:{}", key, e);
+        }
+        return null;
+    }
+
+    public <T> T getAndSet(@Nonnull String key, @Nonnull T value, @Nonnull TypeReference<T> type, @Nonnull Integer seconds) {
+        try {
+            String jsonString = redisTemplate.opsForValue().getAndSet(key, toJson(value));
+            redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
+            if (StringUtils.isEmpty(jsonString)) {
+                return null;
+            }
+            return fromJson(jsonString, type);
+        } catch (Exception e) {
+            log.error("操作缓存异常：key:{}", key, e);
+        }
+        return null;
+    }
+
     /**
      * 设置key的过期时间
      * @author             TanYibin
@@ -200,13 +230,13 @@ public class HuahengRedisUtil {
      * @param      key
      * @return
      */
-    public <T> T get(@Nonnull String key) {
+    public <T> T get(@Nonnull String key, @Nonnull TypeReference<T> type) {
         try {
             String result = redisTemplate.opsForValue().get(key);
             if (StringUtils.isEmpty(result)) {
                 return null;
             }
-            return fromJson(result, new TypeReference<T>() {});
+            return fromJson(result, type);
         } catch (Exception e) {
             log.error("操作缓存异常：key:{}", key, e);
         }
@@ -243,101 +273,4 @@ public class HuahengRedisUtil {
         }
         return false;
     }
-
-    /**
-     * 设置key，List 过期时间7200（秒）
-     * @author          TanYibin
-     * @createDate      2023年2月8日
-     * @param      key
-     * @param      list
-     */
-    public void setList(@Nonnull String key, @Nonnull List list) {
-        try {
-            redisTemplate.opsForValue().set(key, toJson(list), 7200, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-    }
-
-    /**
-     * 设置key，List，过期时间
-     * @author          TanYibin
-     * @createDate      2023年2月8日
-     * @param      key
-     * @param      list
-     */
-    public void setList(@Nonnull String key, @Nonnull List list, @Nonnull Integer seconds) {
-        try {
-            redisTemplate.opsForValue().set(key, toJson(list), seconds, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-    }
-
-    /**
-     * 获取key对应的List
-     * @author           TanYibin
-     * @createDate       2023年2月8日
-     * @param      <T>
-     * @param      key
-     * @param      clazz
-     * @return
-     */
-    public <T> List<T> getList(@Nonnull String key, @Nonnull Class<T> clazz) {
-        try {
-            String result = redisTemplate.opsForValue().get(key);
-            if (StringUtils.isEmpty(result)) {
-                return null;
-            }
-            return fromJsonList(result, clazz);
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-        return null;
-    }
-
-    /**
-     * 设置key，Map 过期时间7200（秒）
-     * @author         TanYibin
-     * @createDate     2023年2月8日
-     * @param      key
-     * @param      Map
-     */
-    public void setMap(@Nonnull String key, @Nonnull Map map) {
-        try {
-            redisTemplate.opsForValue().set(key, toJson(map), 7200, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-    }
-
-    public void setMap(@Nonnull String key, @Nonnull Map map, @Nonnull Integer seconds) {
-        try {
-            redisTemplate.opsForValue().set(key, toJson(map), seconds, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-    }
-
-    /**
-     * 获取key对应的Map
-     * @author         TanYibin
-     * @createDate     2023年2月8日
-     * @param      <T>
-     * @param      <S>
-     * @param      key
-     * @return
-     */
-    public <T, S> Map<T, S> getMap(@Nonnull String key) {
-        try {
-            String result = redisTemplate.opsForValue().get(key);
-            if (StringUtils.isEmpty(result)) {
-                return null;
-            }
-            return fromJson(result, new TypeReference<Map<T, S>>() {});
-        } catch (Exception e) {
-            log.error("操作缓存异常：key:{}", key, e);
-        }
-        return null;
-    }
 }
 \ No newline at end of file
@@ -47,7 +47,7 @@ spring:
       org:
         quartz:
           scheduler:
-            instanceName: MyScheduler
+            instanceName: Scheduler_Dev
             instanceId: AUTO
           jobStore:
             class: org.quartz.impl.jdbcjobstore.JobStoreTX
@@ -47,7 +47,7 @@ spring:
       org:
         quartz:
           scheduler:
-            instanceName: MyScheduler
+            instanceName: Scheduler_Prod
             instanceId: AUTO
           jobStore:
             class: org.quartz.impl.jdbcjobstore.JobStoreTX
@@ -47,7 +47,7 @@ spring:
       org:
         quartz:
           scheduler:
-            instanceName: MyScheduler
+            instanceName: Scheduler_Test
             instanceId: AUTO
           jobStore:
             class: org.quartz.impl.jdbcjobstore.JobStoreTX
@@ -65,16 +65,16 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-  aop:
-    proxy-target-class: true
+  jpa:
+    open-in-view: false
   activiti:
     check-process-definitions: false
     #启用作业执行器
     async-executor-activate: false
     #启用异步执行器
     job-executor-activate: false
-  jpa:
-    open-in-view: false
+  aop:
+    proxy-target-class: true
   #配置freemarker
   freemarker:
     # 设置模板后缀名