From 7b36e4b35915b58259e5ea50a964db3c5b2b1d8d Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Mon, 30 Sep 2024 09:22:46 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=9B=B4=E6=A0=8F=E5=92=8C=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E7=9A=84=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-cache/pom.xml | 28 +++++++++++++ .../java/com/muyu/cache/CacheAbsBasic.java | 38 ++++++++++++++++++ .../main/java/com/muyu/cache/CacheBasic.java | 16 ++++++++ .../java/com/muyu/cache/PrimaryKeyBasic.java | 34 ++++++++++++++++ cloud-common/pom.xml | 1 + cloud-modules/saas/pom.xml | 1 + cloud-modules/saas/saas-cache/pom.xml | 40 +++++++++++++++++++ .../cache/ElectronicFenceCacheService.java | 32 +++++++++++++++ .../ElectronicFenceGroupCacheService.java | 32 +++++++++++++++ .../muyu/cache/EnterpriseCacheService.java | 32 +++++++++++++++ .../muyu/cache/SysCarFaultCacheService.java | 32 +++++++++++++++ .../cache/SysCarFaultMessageCacheService.java | 23 +++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 5 +++ .../java/com/muyu/common/domain/DataType.java | 4 +- cloud-modules/saas/saas-server/pom.xml | 6 +++ .../mapper/MessageTemplateTypeMapper.java | 2 - .../impl/ElectronicFenceGroupServiceImpl.java | 10 +++++ .../impl/ElectronicFenceServiceImpl.java | 37 ++++++++++++----- .../service/impl/EnterpriseServiceImpl.java | 17 ++++++++ .../impl/SysCarFaultMessageServiceImpl.java | 34 ++++++++++++++-- .../service/impl/SysCarFaultServiceImpl.java | 19 ++++++++- 21 files changed, 425 insertions(+), 18 deletions(-) create mode 100644 cloud-common/cloud-common-cache/pom.xml create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/PrimaryKeyBasic.java create mode 100644 cloud-modules/saas/saas-cache/pom.xml create mode 100644 cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java create mode 100644 cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java create mode 100644 cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java create mode 100644 cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java create mode 100644 cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java create mode 100644 cloud-modules/saas/saas-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml new file mode 100644 index 0000000..e303122 --- /dev/null +++ b/cloud-common/cloud-common-cache/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + com.muyu.cache + cloud-common-cache + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-common-redis + + + + 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 new file mode 100644 index 0000000..bc3a38c --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java @@ -0,0 +1,38 @@ +package com.muyu.cache;/** + * @author yuping + * @package com.muyu.cache + * @name CacheAbsBasic + * @date 2024/9/29 20:10 抽象缓存层 + */ + +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +import static cn.hutool.core.lang.ansi.AnsiEncoder.encode; + +/** + * @Author YuPing + * @Description + * @Version 1.0 + * @Data 2024-09-29 20:10:09 + */ +public abstract class CacheAbsBasic implements CacheBasic{ + + @Autowired + private RedisService redisService; // spring redis 工具类 + + @Override + public void put(K key, V value) { + redisService.setCacheObject(encodeKey(key), value); // 编码 --> 缓存基础的对象 Integer String 实体类等 + } + + @Override + public V get(K key) { + return redisService.getCacheObject(encode(key)); // 获取缓存的基本对象 编码 + } + + @Override + public void remove(K key) { + redisService.deleteObject(encode(key)); + } +} 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 new file mode 100644 index 0000000..11ed9d5 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheBasic.java @@ -0,0 +1,16 @@ +package com.muyu.cache; + +/** + * @author yuping + * @package com.muyu.cache + * @name CacheBasic + * @date 2024/9/29 20:08 缓存基础 + */ +public interface CacheBasic extends PrimaryKeyBasic{ + + void put(K key, V value); + + V get(K key); + + void remove(K key); +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/PrimaryKeyBasic.java new file mode 100644 index 0000000..c6a64cc --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/PrimaryKeyBasic.java @@ -0,0 +1,34 @@ +package com.muyu.cache; + +/** + * @author yuping + * @package com.muyu.cache + * @name PrimaryKeyBasic + * @date 2024/9/29 20:03 主键基础 + */ +public interface PrimaryKeyBasic { + + /** + * key 前缀 + * @return key前缀 + */ + public String keyPre(); + + + /** + * key 编码 + * @param key 缓存键 + * @return 封装键 + */ + public default String encodeKey(K key) { + return keyPre() + key.toString(); //key 前缀 + } + + /** + * 解码 key + * @param key 编码key + * @return 解码后的key + */ + public K decode(String key); + +} diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index a7a40be..67bf1c6 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -21,6 +21,7 @@ cloud-common-xxl cloud-common-rabbit cloud-common-saas + cloud-common-cache cloud-common diff --git a/cloud-modules/saas/pom.xml b/cloud-modules/saas/pom.xml index 83f4ea5..4bd4f4e 100644 --- a/cloud-modules/saas/pom.xml +++ b/cloud-modules/saas/pom.xml @@ -14,6 +14,7 @@ saas-common saas-server + saas-cache diff --git a/cloud-modules/saas/saas-cache/pom.xml b/cloud-modules/saas/saas-cache/pom.xml new file mode 100644 index 0000000..3359924 --- /dev/null +++ b/cloud-modules/saas/saas-cache/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + com.muyu + saas + 3.6.3 + + + saas-cache + + + 17 + 17 + UTF-8 + + + + saas-cache缓存模块 + + + + + + com.muyu.common + saas-common + 3.6.3 + + + + com.muyu.cache + cloud-common-cache + 3.6.3 + + + + + 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 new file mode 100644 index 0000000..85634fa --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.database.ElectronicFence; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 电子围栏缓存 + * @Version 1.0 + * @Data 2024-09-29 20:53:46 + */ +@Component +public class ElectronicFenceCacheService extends CacheAbsBasic{ + /** + * key前缀 + * @return + */ + @Override + public String keyPre() { + return "electronicFence"; + } + + /** + * 解码 + * @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/ElectronicFenceGroupCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java new file mode 100644 index 0000000..dcde553 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.database.ElectronicFenceGroup; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 围栏组缓存 + * @Version 1.0 + * @Data 2024-09-29 20:57:46 + */ +@Component +public class ElectronicFenceGroupCacheService extends CacheAbsBasic{ + /** + * key前缀 + * @return + */ + @Override + public String keyPre() { + return "electronicFenceGroup"; + } + + /** + * 解码 + * @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/EnterpriseCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java new file mode 100644 index 0000000..b2b97a2 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.Enterprise; +import org.springframework.stereotype.Component; + +/** + * @author yuping + * @package com.muyu.cache + * @name EnterpriseCacheService + * @date 2024/9/29 20:21 企业缓存 + */ +@Component +public class EnterpriseCacheService extends CacheAbsBasic{ + /** + * 缓存前缀 + * @return + */ + @Override + public String keyPre() { + return "enterprise:info:"; + } + + /** + * 解码 + * @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/SysCarFaultCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java new file mode 100644 index 0000000..4ab25cc --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java @@ -0,0 +1,32 @@ +package com.muyu.cache; + +import com.muyu.common.domain.SysCarFault; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 故障缓存 + * @Version 1.0 + * @Data 2024-09-29 21:10:31 + */ +@Component +public class SysCarFaultCacheService extends CacheAbsBasic{ + /** + * 缓存前缀 + * @return + */ + @Override + public String keyPre() { + return "sysCarFault"; + } + + /** + * 解码 + * @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/SysCarFaultMessageCacheService.java b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java new file mode 100644 index 0000000..d436372 --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java @@ -0,0 +1,23 @@ +package com.muyu.cache; + +import com.muyu.common.domain.SysCarFaultMessage; +import org.springframework.stereotype.Component; + +/** + * @Author YuPing + * @Description 站内信缓存 + * @Version 1.0 + * @Data 2024-09-29 21:13:19 + */ +@Component +public class SysCarFaultMessageCacheService extends CacheAbsBasic{ + @Override + public String keyPre() { + return "sysCarFaultMessage"; + } + + @Override + public String decode(String key) { + return key.replace(keyPre(), ""); + } +} diff --git a/cloud-modules/saas/saas-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/saas/saas-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d94228b --- /dev/null +++ b/cloud-modules/saas/saas-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.muyu.cache.ElectronicFenceCacheService +com.muyu.cache.ElectronicFenceGroupCacheService +com.muyu.cache.EnterpriseCacheService +com.muyu.cache.SysCarFaultCacheService +com.muyu.cache.SysCarFaultMessageCacheService diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java index b70a583..a89b51c 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java @@ -28,10 +28,10 @@ public class DataType implements Serializable{ * 数据类型ID */ @TableId(value = "data_type_id",type = IdType.AUTO) - private Integer DataTypeId; + private Integer dataTypeId; /** * 数据类型名称 */ - private String DataTypeName; + private String dataTypeName; } diff --git a/cloud-modules/saas/saas-server/pom.xml b/cloud-modules/saas/saas-server/pom.xml index 56f77f3..a5c9198 100644 --- a/cloud-modules/saas/saas-server/pom.xml +++ b/cloud-modules/saas/saas-server/pom.xml @@ -24,6 +24,12 @@ + + com.muyu + saas-cache + 3.6.3 + + com.muyu.common saas-common diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/MessageTemplateTypeMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/MessageTemplateTypeMapper.java index 5fcd085..129aafb 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/MessageTemplateTypeMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/MessageTemplateTypeMapper.java @@ -14,6 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MessageTemplateTypeMapper extends BaseMapper { - - } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceGroupServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceGroupServiceImpl.java index 2a7370e..af7f5b1 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceGroupServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceGroupServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cache.ElectronicFenceGroupCacheService; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.domain.database.ElectronicFenceGroup; import com.muyu.common.domain.database.FenceGroupMid; @@ -38,6 +39,9 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl selectGroupList(ElectronicFenceGroupListReq req) { @@ -55,6 +59,10 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl list = this.list(queryWrapper); + list.forEach(electronicFenceGroup -> { + electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup); + }); + return list; } @@ -77,6 +85,8 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl fenceselectList(ElectroicFenceListReq electroicFenceListReq) { @@ -38,40 +42,44 @@ public class ElectronicFenceServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like( - StringUtils.isNotNull(electroicFenceListReq.getName()),ElectronicFence::getName, electroicFenceListReq.getName() + StringUtils.isNotEmpty(electroicFenceListReq.getName()),ElectronicFence::getName, electroicFenceListReq.getName() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()),ElectronicFence::getFenceType, electroicFenceListReq.getFenceType() ); - queryWrapper.eq( - StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()),ElectronicFence::getFenceType, electroicFenceListReq.getFenceType() - ); queryWrapper.eq( StringUtils.isNotEmpty(electroicFenceListReq.getStatus()),ElectronicFence::getStatus, electroicFenceListReq.getStatus() ); List list = this.list(queryWrapper); + list.forEach(electronicFence -> { + electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence); + }); + return list.stream().map(ElectronicFence::bullerResp).toList(); } @Override public void AddFence(ElectroicFenceAddReq electroicFenceAddReq) { - - electronicFenceMapper.insert(ElectronicFence.buildElectroicAdd(electroicFenceAddReq)); - - - - } @Override public ElectronicFence findElectronicByid(Long id) { ElectronicFence electronicFence = electronicFenceMapper.selectById(id); + + electronicFenceCacheService.put(id.toString(),electronicFence); + return electronicFence; } @Override public void delElectronById(Long id) { + + electronicFenceCacheService.remove(id.toString()); + electronicFenceMapper.deleteById(id); } @@ -118,6 +126,10 @@ public class ElectronicFenceServiceImpl extends ServiceImpl list = this.list(wrapper); + list.forEach(electronicFence -> { + electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence); + }); + return list.stream().map(ElectronicFence::bullerResp).toList(); } @@ -129,6 +141,8 @@ public class ElectronicFenceServiceImpl extends ServiceImpl fenceList = this.list(queryWrapper); + electronicFenceCacheService.remove(name); + if (fenceList.size()>0){ throw new RuntimeException("电子围栏名不能重复"); } @@ -141,6 +155,9 @@ public class ElectronicFenceServiceImpl extends ServiceImpl electronicFenceList = this.list(Wrappers.lambdaQuery().in(ElectronicFence::getId, ids)); + electronicFenceList.forEach(electronicFence -> { + electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence); + }); return electronicFenceList.stream().map(ElectronicFence::bullerResp).toList(); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java index 47b5480..e58e2b3 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java @@ -1,6 +1,7 @@ package com.muyu.server.service.impl; import cn.hutool.core.map.MapUtil; +import com.muyu.cache.EnterpriseCacheService; import com.muyu.common.domain.Enterprise; import com.muyu.common.util.PageUtils; import com.muyu.server.mapper.EnterpriseDao; @@ -22,6 +23,9 @@ public class EnterpriseServiceImpl implements EnterpriseService { @Autowired private EnterpriseDao enterpriseDao; + @Autowired + private EnterpriseCacheService enterpriseCacheService; + /** * 分页查询企业运营信息 * @param param @@ -49,6 +53,9 @@ public class EnterpriseServiceImpl implements EnterpriseService { @Override public int insert(Enterprise enterprise) { int rows = enterpriseDao.insert(enterprise); + if (rows > 0){ + enterpriseCacheService.put(String.valueOf(enterprise.getEnterpriseId()), enterprise); + } return rows; } @@ -61,6 +68,12 @@ public class EnterpriseServiceImpl implements EnterpriseService { @Override public HashMap searchById(int enterpriseId) { HashMap map = enterpriseDao.searchById(enterpriseId); + if (map != null){ + Enterprise enterprise = enterpriseCacheService.get(String.valueOf(enterpriseId)); + if (enterprise != null){ + map.put("enterprise", enterprise); + } + } return map; } @@ -73,6 +86,9 @@ public class EnterpriseServiceImpl implements EnterpriseService { @Override public int updateEnterprise(Enterprise enterprise) { int rows = enterpriseDao.updateEnterprise(enterprise); + if (rows > 0){ + enterpriseCacheService.put(String.valueOf(enterprise.getEnterpriseId()), enterprise); + } return rows; } @@ -90,6 +106,7 @@ public class EnterpriseServiceImpl implements EnterpriseService { Integer[] idList = Arrays.asList(ids).toArray(new Integer[0]); int rows = enterpriseDao.deleteByIds(idList); + enterpriseCacheService.remove(String.valueOf(idList)); return rows; } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java index 244caaa..20e61ab 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java @@ -3,9 +3,11 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cache.SysCarFaultMessageCacheService; import com.muyu.common.domain.SysCarFaultMessage; import com.muyu.server.mapper.SysCarFaultMessageMapper; import com.muyu.server.service.SysCarFaultMessageService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,6 +22,11 @@ import java.util.List; @Service public class SysCarFaultMessageServiceImpl extends ServiceImpl implements SysCarFaultMessageService { + + @Autowired + private SysCarFaultMessageCacheService sysCarFaultMessageCacheService; + + /** * 查询故障消息列表 * @param sysCarFaultMessage @@ -28,7 +35,14 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - return baseMapper.selectList(wrapper); + + List list = baseMapper.selectList(wrapper); + + list.forEach(item->{ + sysCarFaultMessageCacheService.put(item.getContent(),item); + }); + + return list; } /** @@ -37,7 +51,14 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl listStatusOnt( ) { - return baseMapper.listStatusOnt(); + + List list = baseMapper.listStatusOnt(); + + list.forEach(item->{ + sysCarFaultMessageCacheService.put(item.getContent(),item); + }); + + return list; } /** @@ -46,6 +67,13 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl listStatusTwo( ) { - return baseMapper.listStatusTwo(); + + List list = baseMapper.listStatusTwo(); + + list.forEach(item->{ + sysCarFaultMessageCacheService.put(item.getContent(),item); + }); + + return list; } } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java index ef2ac45..9ef408e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cache.SysCarFaultCacheService; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.domain.SysCarFault; import com.muyu.server.mapper.SysCarFaultMapper; @@ -27,6 +28,9 @@ public class SysCarFaultServiceImpl @Autowired private SysCarFaultMapper mapper; + @Autowired + private SysCarFaultCacheService sysCarFaultCacheService; + /** * 精确查询车辆故障管理 * @@ -39,6 +43,9 @@ public class SysCarFaultServiceImpl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Assert.notNull(id, "id不可为空"); queryWrapper.eq(SysCarFault::getId, id); + + sysCarFaultCacheService.put(id.toString(),this.getOne(queryWrapper)); + return this.getOne(queryWrapper); } @@ -70,7 +77,14 @@ public class SysCarFaultServiceImpl if (sysCarFault.getCarTypeId()!=null){ queryWrapper.eq(SysCarFault::getCarTypeId,sysCarFault.getTypeId()); } - return this.list(queryWrapper); + + List list = this.list(queryWrapper); + + list.forEach(sysCarFault1 -> { + sysCarFaultCacheService.put(sysCarFault1.getId().toString(),sysCarFault1); + }); + + return list; } @@ -83,6 +97,9 @@ public class SysCarFaultServiceImpl @Override public SysCarFault selectFaultByFaultCode(String faultCode) { + + sysCarFaultCacheService.put(faultCode,mapper.selectFaultByFaultCode(faultCode)); + return mapper.selectFaultByFaultCode(faultCode); }