skyline 2 роки тому
батько
коміт
e53709271f

+ 1 - 1
admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -5,7 +5,7 @@ import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.Station;
 import com.kym.service.admin.StationService;
-import com.kym.service.utils.KymCache;
+import com.kym.service.cache.KymCache;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
admin/src/main/java/com/kym/admin/jobs/OfflineNotify.java

@@ -3,7 +3,7 @@ package com.kym.admin.jobs;
 import cn.hutool.extra.mail.MailUtil;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.common.RedisKeys;
-import com.kym.service.utils.KymCache;
+import com.kym.service.cache.KymCache;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;

+ 5 - 1
common/src/main/java/com/kym/common/cache/DynamicDataCache.java

@@ -10,6 +10,10 @@ import cn.hutool.cache.impl.TimedCache;
  */
 public enum DynamicDataCache {
     INSTANCE;
+
+    /**
+     * 缓存默认5min有效期
+     */
     public static TimedCache<String, Object> timedCache = CacheUtil.newTimedCache(5 * 60 * 1000);
 
     public void put(String key, Object value) {
@@ -20,7 +24,7 @@ public enum DynamicDataCache {
         timedCache.put(key, value, timeout);
     }
 
-    public  Object get(String key) {
+    public Object get(String key) {
         return timedCache.get(key);
     }
 

+ 1 - 1
service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.kym.entity.admin.queryParams.EquipmentQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.EquipmentInfoMapper;
 import com.kym.service.admin.EquipmentInfoService;
-import com.kym.service.utils.KymCache;
+import com.kym.service.cache.KymCache;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 

+ 3 - 4
service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -3,6 +3,7 @@ package com.kym.service.admin.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kym.common.annotation.DynamicCache;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.utils.AESUtil;
 import com.kym.common.utils.CommUtil;
@@ -15,8 +16,8 @@ import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.mapper.admin.StationMapper;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.StationService;
+import com.kym.service.cache.KymCache;
 import com.kym.service.enplus.EnPlusService;
-import com.kym.service.utils.KymCache;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -39,12 +40,10 @@ import java.util.List;
 public class StationServiceImpl extends ServiceImpl<StationMapper, Station> implements StationService {
 
     private final KymCache kymCache;
-
     private final EquipmentInfoService equipmentInfoService;
-
-
     private final EnPlusService enPlusService;
 
+
     public StationServiceImpl(@Lazy KymCache kymCache, EnPlusService enPlusService, EquipmentInfoService equipmentInfoService) {
         this.kymCache = kymCache;
         this.enPlusService = enPlusService;

+ 1 - 1
service/src/main/java/com/kym/service/utils/KymCache.java → service/src/main/java/com/kym/service/cache/KymCache.java

@@ -1,4 +1,4 @@
-package com.kym.service.utils;
+package com.kym.service.cache;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.AdminUserStation;

+ 1 - 1
service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -18,7 +18,7 @@ import com.kym.service.admin.MonitorLogService;
 import com.kym.service.enplus.EnNotifyService;
 import com.kym.service.enplus.EnPlusService;
 import com.kym.service.miniapp.*;
-import com.kym.service.utils.KymCache;
+import com.kym.service.cache.KymCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

+ 1 - 1
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -22,7 +22,7 @@ import com.kym.service.admin.ExportService;
 import com.kym.service.admin.RechargeRightsService;
 import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.OrderRechargeRightsService;
-import com.kym.service.utils.KymCache;
+import com.kym.service.cache.KymCache;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;