From 6dd3d73f6291fc0c7767a3679a10469ec0f0379d Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Wed, 2 Oct 2024 16:23:41 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E6=8A=8Asaas=E7=BC=93=E5=AD=98=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=8D=A2=E6=88=90=E7=BC=93=E5=AD=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/cache/CacheAbsBasic.java | 3 ++- .../main/java/com/muyu/template/config/MqttConfigure.java | 4 +--- .../src/main/java/com/muyu/cache/CarTypeCacheService.java | 4 +++- .../src/main/java/com/muyu/cache/DataTypeCacheService.java | 4 +++- .../java/com/muyu/cache/ElectronicFenceCacheService.java | 2 +- .../com/muyu/cache/ElectronicFenceGroupCacheService.java | 4 +++- .../main/java/com/muyu/cache/EnterpriseCacheService.java | 4 +++- .../java/com/muyu/cache/MessageTemplateCacheService.java | 4 +++- .../com/muyu/cache/MessageTemplateTypeCacheService.java | 4 +++- .../src/main/java/com/muyu/cache/SysCarCacheService.java | 7 +++++-- .../main/java/com/muyu/cache/SysCarFaultCacheService.java | 4 +++- .../com/muyu/cache/SysCarFaultMessageCacheService.java | 4 +++- .../src/main/java/com/muyu/cache/TemplateCacheService.java | 4 +++- .../src/main/java/com/muyu/cache/WarnRuleCacheService.java | 6 ++++-- .../main/java/com/muyu/cache/WarnStrategyCacheService.java | 6 ++++-- 15 files changed, 44 insertions(+), 20 deletions(-) diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java index 7bb8868..a2bd6ca 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; import static cn.hutool.core.lang.ansi.AnsiEncoder.encode; @@ -26,7 +27,7 @@ public abstract class CacheAbsBasic implements CacheBasic{ @Override public void put(K key, V value) { - redisService.setCacheObject(encodeKey(key), value); // 编码 --> 缓存基础的对象 Integer String 实体类等 + redisService.setCacheObject(encodeKey(key), value,30L, TimeUnit.MINUTES); // 编码 --> 缓存基础的对象 Integer String 实体类等 } @Override diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java index 746b9ac..7593fd5 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java @@ -4,9 +4,6 @@ import com.alibaba.fastjson2.JSON; import com.muyu.common.domain.MessageTemplateType; import com.muyu.common.domain.SysCar; import com.muyu.common.redis.service.RedisService; -import com.muyu.server.service.MessageTemplateTypeService; -import com.muyu.server.service.SysCarService; -import com.muyu.server.service.impl.SysCarServiceImpl; import lombok.extern.log4j.Log4j2; import org.eclipse.paho.client.mqttv3.*; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +13,7 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.List; /** + * * @author liuxinyue * @Package：com.muyu.mqtt.configure * @Project：cloud-server diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java index e9fb94c..08de218 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.CarType; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 车辆类型缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 16:31:44 */ @Component -public class CarTypeCacheService extends CacheAbsBasic { +public class CarTypeCacheService extends CacheAbsBasic> { /** * 缓存key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java index 8636b7c..aa651cc 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.DataType; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 数据类型缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 10:57:24 */ @Component -public class DataTypeCacheService extends CacheAbsBasic { +public class DataTypeCacheService extends CacheAbsBasic> { /** * key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java index 2bb13d5..f8d0e4c 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java @@ -12,7 +12,7 @@ import java.util.List; * @Data 2024-09-29 20:53:46 */ @Component -public class ElectronicFenceCacheService extends CacheAbsBasic{ +public class ElectronicFenceCacheService extends CacheAbsBasic>{ /** * key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java index dcde553..5142e3b 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.database.ElectronicFenceGroup; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 围栏组缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-29 20:57:46 */ @Component -public class ElectronicFenceGroupCacheService extends CacheAbsBasic{ +public class ElectronicFenceGroupCacheService extends CacheAbsBasic>{ /** * key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java index b2b97a2..9abbdba 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.Enterprise; import org.springframework.stereotype.Component; +import java.util.List; + /** * @author yuping * @package com.muyu.cache @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @date 2024/9/29 20:21 企业缓存 */ @Component -public class EnterpriseCacheService extends CacheAbsBasic{ +public class EnterpriseCacheService extends CacheAbsBasic>{ /** * 缓存前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java index 04d88b3..376d385 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.MessageTemplate; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 报文缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 11:01:13 */ @Component -public class MessageTemplateCacheService extends CacheAbsBasic{ +public class MessageTemplateCacheService extends CacheAbsBasic>{ /** * key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java index b030c05..df1fe14 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.MessageTemplateType; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 报文模版类型缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 11:04:43 */ @Component -public class MessageTemplateTypeCacheService extends CacheAbsBasic{ +public class MessageTemplateTypeCacheService extends CacheAbsBasic>{ /** * 缓存key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java index 090eae5..b5099f1 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java @@ -1,8 +1,11 @@ package com.muyu.cache; import com.muyu.common.domain.SysCar; +import com.muyu.common.domain.resp.SysCarVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 车辆缓存 @@ -10,14 +13,14 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 16:35:14 */ @Component -public class SysCarCacheService extends CacheAbsBasic{ +public class SysCarCacheService extends CacheAbsBasic>{ /** * key前缀 * @return */ @Override public String keyPre() { - return "car:"; + return "car"; } /** diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java index 4ab25cc..66bda2f 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.SysCarFault; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 故障缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-29 21:10:31 */ @Component -public class SysCarFaultCacheService extends CacheAbsBasic{ +public class SysCarFaultCacheService extends CacheAbsBasic>{ /** * 缓存前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java index d436372..178123f 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.SysCarFaultMessage; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 站内信缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-29 21:13:19 */ @Component -public class SysCarFaultMessageCacheService extends CacheAbsBasic{ +public class SysCarFaultMessageCacheService extends CacheAbsBasic>{ @Override public String keyPre() { return "sysCarFaultMessage"; diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java index f283b94..9ca26c7 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.Template; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 报文模版缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 18:21:46 */ @Component -public class TemplateCacheService extends CacheAbsBasic{ +public class TemplateCacheService extends CacheAbsBasic>{ /** * 缓存key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java index 4c268bf..8adc7e2 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java @@ -1,8 +1,10 @@ package com.muyu.cache; -import com.muyu.common.domain.WarnRule; +import com.muyu.common.domain.resp.WarnRuleResp; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 预警规则缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 16:37:09 */ @Component -public class WarnRuleCacheService extends CacheAbsBasic{ +public class WarnRuleCacheService extends CacheAbsBasic>{ /** * 缓存key前缀 * @return diff --git a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java index d4a81bd..63bcbbb 100644 --- a/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java @@ -1,8 +1,10 @@ package com.muyu.cache; -import com.muyu.common.domain.WarnStrategy; +import com.muyu.common.domain.resp.WarnStrategyResp; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 预警策略缓存 @@ -10,7 +12,7 @@ import org.springframework.stereotype.Component; * @Data 2024-09-30 16:38:35 */ @Component -public class WarnStrategyCacheService extends CacheAbsBasic { +public class WarnStrategyCacheService extends CacheAbsBasic> { /** * 缓存key前缀 * @return