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 bc3a38c..7bb8868 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 @@ -8,6 +8,9 @@ package com.muyu.cache;/** import com.muyu.common.redis.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + import static cn.hutool.core.lang.ansi.AnsiEncoder.encode; /** diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java index 11ed9d5..4b2191c 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java @@ -1,5 +1,7 @@ package com.muyu.cache; +import java.util.List; + /** * @author yuping * @package com.muyu.cache 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 new file mode 100644 index 0000000..e9fb94c --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.CarType; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 车辆类型缓存 + * @Version 1.0 + * @Data 2024-09-30 16:31:44 + */ +@Component +public class CarTypeCacheService extends CacheAbsBasic { + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "carType:"; + } + + /** + * 解码key + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..8636b7c --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java @@ -0,0 +1,33 @@ +package com.muyu.cache; + +import com.muyu.common.domain.DataType; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 数据类型缓存 + * @Version 1.0 + * @Data 2024-09-30 10:57:24 + */ +@Component +public class DataTypeCacheService extends CacheAbsBasic { + /** + * key前缀 + * @return + */ + @Override + public String keyPre() { + return "DataType"; + } + + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 85634fa..2bb13d5 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 @@ -3,6 +3,8 @@ package com.muyu.cache; import com.muyu.common.domain.database.ElectronicFence; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author YuPing * @Description 电子围栏缓存 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 new file mode 100644 index 0000000..04d88b3 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.MessageTemplate; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 报文缓存 + * @Version 1.0 + * @Data 2024-09-30 11:01:13 + */ +@Component +public class MessageTemplateCacheService extends CacheAbsBasic{ + /** + * key前缀 + * @return + */ + @Override + public String keyPre() { + return "message_template"; + } + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..b030c05 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.MessageTemplateType; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 报文模版类型缓存 + * @Version 1.0 + * @Data 2024-09-30 11:04:43 + */ +@Component +public class MessageTemplateTypeCacheService extends CacheAbsBasic{ + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "messageTemplateType"; + } + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..090eae5 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.SysCar; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 车辆缓存 + * @Version 1.0 + * @Data 2024-09-30 16:35:14 + */ +@Component +public class SysCarCacheService extends CacheAbsBasic{ + /** + * key前缀 + * @return + */ + @Override + public String keyPre() { + return "car:"; + } + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..f283b94 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.Template; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 报文模版缓存 + * @Version 1.0 + * @Data 2024-09-30 18:21:46 + */ +@Component +public class TemplateCacheService extends CacheAbsBasic{ + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "template"; + } + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..4c268bf --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.WarnRule; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 预警规则缓存 + * @Version 1.0 + * @Data 2024-09-30 16:37:09 + */ +@Component +public class WarnRuleCacheService extends CacheAbsBasic{ + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "warnRule"; + } + + /** + * 解码 + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} 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 new file mode 100644 index 0000000..d4a81bd --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.WarnStrategy; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 预警策略缓存 + * @Version 1.0 + * @Data 2024-09-30 16:38:35 + */ +@Component +public class WarnStrategyCacheService extends CacheAbsBasic { + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "warnStrategy"; + } + + /** + * 解码key + * @param key 编码key + * @return + */ + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java index 7e64554..3e1a9a8 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java @@ -2,6 +2,7 @@ package com.muyu.server.mapper; import com.muyu.common.domain.Enterprise; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.ArrayList; import java.util.HashMap; @@ -26,5 +27,5 @@ public interface EnterpriseDao { //删除企业信息 - public int deleteByIds(Integer[] ids); + public int deleteByIds(@Param("ids") Integer[] ids); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceServiceImpl.java index 69ce47e..c72cab2 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -53,9 +54,12 @@ public class ElectronicFenceServiceImpl extends ServiceImpl list = this.list(queryWrapper); list.forEach(electronicFence -> { - electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence); + electronicFenceCacheService.put(electronicFence.getId().toString(), electronicFence); }); + ElectronicFence electronicFence = electronicFenceCacheService.get("electronicFence"); + log.info("electronicFenceCacheService.get(electronicFence) = {}",electronicFence); + return list.stream().map(ElectronicFence::bullerResp).toList(); }