cloud-common/cloud-common-cache/src/main/java/com/muyu/cache/CacheAbsBasic.java

@@ -10,7 +10,6 @@ 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;
 
@@ -27,7 +26,7 @@ public abstract class CacheAbsBasic<K,V> implements CacheBasic<K,V>{
 
     @Override
     public void put(K key, V value) {
-        redisService.setCacheObject(encodeKey(key), value,30L, TimeUnit.MINUTES); // 编码  -->  缓存基础的对象   Integer   String  实体类等
+        redisService.setCacheObject(encodeKey(key), value); // 编码  -->  缓存基础的对象   Integer   String  实体类等
     }
 
     @Override

cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java

@@ -4,6 +4,9 @@ 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;
@@ -13,7 +16,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.List;
 /**
- *
  * @author liuxinyue
  * @Package：com.muyu.mqtt.configure
  * @Project：cloud-server

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/CarTypeCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.CarType;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 车辆类型缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 16:31:44
  */
 @Component
-public class CarTypeCacheService extends CacheAbsBasic<String, List<CarType>> {
+public class CarTypeCacheService extends CacheAbsBasic<String, CarType> {
     /**
      * 缓存key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/DataTypeCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.DataType;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 数据类型缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 10:57:24
  */
 @Component
-public class DataTypeCacheService extends CacheAbsBasic<String, List<DataType>> {
+public class DataTypeCacheService extends CacheAbsBasic<String, DataType> {
     /**
      * key前缀
      * @return

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<String, List<ElectronicFence>>{
+public class ElectronicFenceCacheService extends CacheAbsBasic<String, ElectronicFence>{
     /**
      * key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/ElectronicFenceGroupCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.database.ElectronicFenceGroup;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 围栏组缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-29 20:57:46
  */
 @Component
-public class ElectronicFenceGroupCacheService extends CacheAbsBasic<String, List<ElectronicFenceGroup>>{
+public class ElectronicFenceGroupCacheService extends CacheAbsBasic<String, ElectronicFenceGroup>{
     /**
      * key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/EnterpriseCacheService.java

@@ -3,8 +3,6 @@ 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
@@ -12,7 +10,7 @@ import java.util.List;
  * @date 2024/9/29  20:21 企业缓存
  */
 @Component
-public class EnterpriseCacheService extends CacheAbsBasic<String, List<Enterprise>>{
+public class EnterpriseCacheService extends CacheAbsBasic<String, Enterprise>{
     /**
      * 缓存前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.MessageTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 报文缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 11:01:13
  */
 @Component
-public class MessageTemplateCacheService extends CacheAbsBasic<String, List<MessageTemplate>>{
+public class MessageTemplateCacheService extends CacheAbsBasic<String, MessageTemplate>{
     /**
      * key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/MessageTemplateTypeCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.MessageTemplateType;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 报文模版类型缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 11:04:43
  */
 @Component
-public class MessageTemplateTypeCacheService extends CacheAbsBasic<String, List<MessageTemplateType>>{
+public class MessageTemplateTypeCacheService extends CacheAbsBasic<String, MessageTemplateType>{
     /**
      * 缓存key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarCacheService.java

@@ -1,11 +1,8 @@
 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 车辆缓存
@@ -13,14 +10,14 @@ import java.util.List;
  * @Data 2024-09-30 16:35:14
  */
 @Component
-public class SysCarCacheService extends CacheAbsBasic<String, List<SysCarVo>>{
+public class SysCarCacheService extends CacheAbsBasic<String, SysCar>{
     /**
      * key前缀
      * @return
      */
     @Override
     public String keyPre() {
-        return "car";
+        return "car:";
     }
 
     /**

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.SysCarFault;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 故障缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-29 21:10:31
  */
 @Component
-public class SysCarFaultCacheService extends CacheAbsBasic<String, List<SysCarFault>>{
+public class SysCarFaultCacheService extends CacheAbsBasic<String, SysCarFault>{
     /**
      * 缓存前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/SysCarFaultMessageCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.SysCarFaultMessage;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 站内信缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-29 21:13:19
  */
 @Component
-public class SysCarFaultMessageCacheService extends CacheAbsBasic<String, List<SysCarFaultMessage>>{
+public class SysCarFaultMessageCacheService extends CacheAbsBasic<String, SysCarFaultMessage>{
     @Override
     public String keyPre() {
         return "sysCarFaultMessage";

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/TemplateCacheService.java

@@ -3,8 +3,6 @@ package com.muyu.cache;
 import com.muyu.common.domain.Template;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 报文模版缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 18:21:46
  */
 @Component
-public class TemplateCacheService extends CacheAbsBasic<String, List<Template>>{
+public class TemplateCacheService extends CacheAbsBasic<String, Template>{
     /**
      * 缓存key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnRuleCacheService.java

@@ -1,10 +1,8 @@
 package com.muyu.cache;
 
-import com.muyu.common.domain.resp.WarnRuleResp;
+import com.muyu.common.domain.WarnRule;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 预警规则缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 16:37:09
  */
 @Component
-public class WarnRuleCacheService extends CacheAbsBasic<String, List<WarnRuleResp>>{
+public class WarnRuleCacheService extends CacheAbsBasic<String, WarnRule>{
     /**
      * 缓存key前缀
      * @return

cloud-modules/saas/saas-cache/src/main/java/com/muyu/cache/WarnStrategyCacheService.java

@@ -1,10 +1,8 @@
 package com.muyu.cache;
 
-import com.muyu.common.domain.resp.WarnStrategyResp;
+import com.muyu.common.domain.WarnStrategy;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author YuPing
  * @Description 预警策略缓存
@@ -12,7 +10,7 @@ import java.util.List;
  * @Data 2024-09-30 16:38:35
  */
 @Component
-public class WarnStrategyCacheService extends CacheAbsBasic<String, List<WarnStrategyResp>> {
+public class WarnStrategyCacheService extends CacheAbsBasic<String, WarnStrategy> {
     /**
      * 缓存key前缀
      * @return

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/DataTypeController.java

@@ -48,7 +48,10 @@ public class DataTypeController {
     public Result<List<DataType>> dataTypeList() {
 
         List<DataType> list = dataTypeService.list();
-        dataTypeCacheService.put("List",list);
+
+        // 缓存数据
+        list.forEach(item->dataTypeCacheService.put(item.getDataTypeId().toString(),item));
+
         return Result.success(list);
     }
 

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java

@@ -47,7 +47,9 @@ public class TemplateController {
 
         List<Template> list = templateService.list();
 
-        templateCacheService.put("List",list);
+        list.forEach(template -> {
+            templateCacheService.put(template.getTemplateId().toString(),template);
+        });
 
         return Result.success(list);
     }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java

@@ -34,7 +34,9 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
         QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
         List<CarType> list = carTypeMapper.selectList(carTypeQueryWrapper);
 
-        carTypeCacheService.put("List", list);
+        for (CarType carType : list) {
+            carTypeCacheService.put(carTypeCacheService.keyPre() + carType.getId(), carType);
+        }
 
         return list;
     }
@@ -42,6 +44,9 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
     @Override
     public CarTypeResp selectCarTypeRespList(Long id) {
         CarTypeResp carTypeResp = carTypeMapper.selectCarTypeRespList(id);
+
+        carTypeCacheService.put(carTypeCacheService.keyPre() + id, carTypeResp);
+
         return carTypeResp;
     }
 
@@ -50,12 +55,21 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
         QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
         carTypeQueryWrapper.eq("car_type_id", carTypeId);
         CarType carType = carTypeMapper.selectOne(carTypeQueryWrapper);
+
+        carTypeCacheService.put(carTypeCacheService.keyPre() + carTypeId, carType);
+
         return carType;
     }
 
     @Override
     public List<CarTypeResp> findAllCars() {
+
         List<CarTypeResp> allCars = carTypeMapper.findAllCars();
+
+        for (CarTypeResp carTypeResp : allCars) {
+            carTypeCacheService.put(carTypeCacheService.keyPre() + carTypeResp.getId(), carTypeResp);
+        }
+
         return allCars;
     }
 }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceGroupServiceImpl.java

@@ -60,7 +60,9 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl<ElectronicFence
         );
         List<ElectronicFenceGroup> list = this.list(queryWrapper);
 
-        electronicFenceGroupCacheService.put("List",list);
+        list.forEach(electronicFenceGroup -> {
+            electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup);
+        });
 
         return list;
 
@@ -83,6 +85,10 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl<ElectronicFence
 
           electronicFenceGroupResp.setElectronicFenceRespList(electronicFenceRespList);
       }
+
+      electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup);
+
+
         return electronicFenceGroupResp;
     }
 

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/ElectronicFenceServiceImpl.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 /**
  * 电子围栏 服务层处理
- *
  * @author yuping
  * @Package：com.muyu.fence.service.impl
  * @Project：cloud-server
@@ -45,87 +44,126 @@ public class ElectronicFenceServiceImpl extends ServiceImpl<ElectronicFenceMappe
         LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
 
         queryWrapper.like(
-                StringUtils.isNotEmpty(electroicFenceListReq.getName()), ElectronicFence::getName, electroicFenceListReq.getName()
+                StringUtils.isNotEmpty(electroicFenceListReq.getName()),ElectronicFence::getName, electroicFenceListReq.getName()
         );
         queryWrapper.eq(
-                StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()), ElectronicFence::getFenceType, electroicFenceListReq.getFenceType()
+                StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()),ElectronicFence::getFenceType, electroicFenceListReq.getFenceType()
         );
         queryWrapper.eq(
-                StringUtils.isNotEmpty(electroicFenceListReq.getStatus()), ElectronicFence::getStatus, electroicFenceListReq.getStatus()
+                StringUtils.isNotEmpty(electroicFenceListReq.getStatus()),ElectronicFence::getStatus, electroicFenceListReq.getStatus()
         );
         List<ElectronicFence> list = this.list(queryWrapper);
 
-        electronicFenceCacheService.put("List", list);
+        list.forEach(electronicFence -> {
+            electronicFenceCacheService.put(electronicFence.getId().toString(), electronicFence);
+        });
 
-        List<ElectronicFence> electronicFenceList = electronicFenceCacheService.get("electronicFenceList");
+        ElectronicFence electronicFence = electronicFenceCacheService.get("electronicFence");
-        log.info("electronicFenceCacheService.get(electronicFenceList) = {}", electronicFenceList);
+        log.info("electronicFenceCacheService.get(electronicFence) = {}",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);
     }
 
 
     @Override
     public void openFence(Long id) {
-        updateStatus(id, 0);
+
+        updateStatus(id,0);
+
     }
 
     @Override
     public void closeFence(Long id) {
-        updateStatus(id, 1);
+        updateStatus(id,1);
     }
 
-    public void updateStatus(Long id, int status) {
+    public void updateStatus (Long id,int status){
         UpdateWrapper<ElectronicFence> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", id).set("status", status);
+
+        updateWrapper.eq("id",id).set("status",status);
+
         this.update(updateWrapper);
+
+
     }
 
 
     @Override
     public void setFenceWay(Long id, String longitudeLatitude) {
+
         UpdateWrapper<ElectronicFence> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", id).set("longitude_latitude", longitudeLatitude);
+
+        updateWrapper.eq("id",id).set("longitude_latitude",longitudeLatitude);
+
         this.update(updateWrapper);
     }
 
     @Override
     public List<ElectronicFenceResp> fenceArray() {
+
         LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
+
         LambdaQueryWrapper<ElectronicFence> wrapper = queryWrapper.eq(ElectronicFence::getStatus, 0);
+
         List<ElectronicFence> list = this.list(wrapper);
+
+        list.forEach(electronicFence -> {
+            electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence);
+        });
+
         return list.stream().map(ElectronicFence::bullerResp).toList();
     }
 
     @Override
     public void unquireFence(String name) {
         LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ElectronicFence::getName, name);
+
+        queryWrapper.eq(ElectronicFence::getName,name);
+
         List<ElectronicFence> fenceList = this.list(queryWrapper);
-        if (fenceList.size() > 0) {
+
+        electronicFenceCacheService.remove(name);
+
+        if (fenceList.size()>0){
             throw new RuntimeException("电子围栏名不能重复");
         }
+
+
     }
 
     @Override
     public List<ElectronicFenceResp> selectListByIds(List<Long> ids) {
+
         List<ElectronicFence> electronicFenceList = this.list(Wrappers.<ElectronicFence>lambdaQuery().in(ElectronicFence::getId, ids));
+
+        electronicFenceList.forEach(electronicFence -> {
+            electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence);
+        });
+
         return  electronicFenceList.stream().map(ElectronicFence::bullerResp).toList();
     }
 }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java

@@ -34,7 +34,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
      */
     @Override
     public PageUtils selectEnterprise(Map param) {
-        List<HashMap> list = new ArrayList<>();
+        ArrayList<HashMap> list = new ArrayList<>();
         long count = enterpriseDao.selectEnterpriseCount();
         if (count > 0){
             list = enterpriseDao.selectEnterprise(param);
@@ -54,6 +54,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;
     }
 
@@ -66,6 +69,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;
     }
 
@@ -78,6 +87,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;
     }
 
@@ -92,8 +104,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         if (ids == null || ids.length == 0) {
             throw new IllegalArgumentException("请选择要删除的企业名称编号");
         }
+
         Integer[] idList = Arrays.asList(ids).toArray(new Integer[0]);
         int rows = enterpriseDao.deleteByIds(idList);
+        enterpriseCacheService.remove(String.valueOf(idList));
         return rows;
 
     }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/MessageTemplateTypeServiceImpl.java

@@ -27,6 +27,9 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
 
     @Override
     public Integer addMessageType(MessageTemplateType messageTemplateType) {
+
+        messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+
         return messageTemplateTypeMapper.insert(messageTemplateType);
     }
 
@@ -38,7 +41,9 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
         messageTemplateTypeQueryWrapper.eq("message_class",code);
         List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
 
-        messageTemplateTypeCacheService.put("List",messageTemplateTypes);
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
 
         return messageTemplateTypes;
     }
@@ -49,6 +54,11 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
         messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
         messageTemplateTypeQueryWrapper.eq("message_class",code);
         List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
+
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
+
         return messageTemplateTypes;
     }
 
@@ -58,6 +68,11 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
         messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
         messageTemplateTypeQueryWrapper.eq("message_class",code);
         List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
+
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
+
         return messageTemplateTypes;
     }
 
@@ -67,6 +82,11 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
         QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
         messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
         List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
+
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
+
         return messageTemplateTypes;
     }
 
@@ -75,6 +95,11 @@ public class MessageTemplateTypeServiceImpl  extends ServiceImpl<MessageTemplate
         QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
         messageTemplateTypeQueryWrapper.eq("template_id",templateId);
         List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
+
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
+
         return messageTemplateTypes;
     }
 }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java

@@ -38,7 +38,9 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
 
         List<SysCarFaultMessage> list = baseMapper.selectList(wrapper);
 
-        sysCarFaultMessageCacheService.put("List",list);
+        list.forEach(item->{
+            sysCarFaultMessageCacheService.put(item.getContent(),item);
+        });
 
         return list;
     }
@@ -51,6 +53,11 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
     public List<SysCarFaultMessage> listStatusOnt( ) {
 
         List<SysCarFaultMessage> list = baseMapper.listStatusOnt();
+
+        list.forEach(item->{
+            sysCarFaultMessageCacheService.put(item.getContent(),item);
+        });
+
         return list;
     }
 
@@ -60,7 +67,13 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
      */
     @Override
     public List<SysCarFaultMessage> listStatusTwo( ) {
+
         List<SysCarFaultMessage> list = baseMapper.listStatusTwo();
+
+        list.forEach(item->{
+            sysCarFaultMessageCacheService.put(item.getContent(),item);
+        });
+
         return list;
     }
 }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java

@@ -43,6 +43,9 @@ public class SysCarFaultServiceImpl
         LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
         Assert.notNull(id, "id不可为空");
         queryWrapper.eq(SysCarFault::getId, id);
+
+        sysCarFaultCacheService.put(id.toString(),this.getOne(queryWrapper));
+
         return this.getOne(queryWrapper);
     }
 
@@ -77,7 +80,9 @@ public class SysCarFaultServiceImpl
 
         List<SysCarFault> list = this.list(queryWrapper);
 
-        sysCarFaultCacheService.put("List",list);
+        list.forEach(sysCarFault1 -> {
+            sysCarFaultCacheService.put(sysCarFault1.getId().toString(),sysCarFault1);
+        });
 
         return list;
     }
@@ -92,6 +97,9 @@ public class SysCarFaultServiceImpl
 
     @Override
     public SysCarFault selectFaultByFaultCode(String faultCode) {
+
+        sysCarFaultCacheService.put(faultCode,mapper.selectFaultByFaultCode(faultCode));
+
         return mapper.selectFaultByFaultCode(faultCode);
     }
 

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java

@@ -13,7 +13,6 @@ import com.muyu.server.service.SysCarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 @DS("lizzDB")
@@ -28,32 +27,56 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> impleme
 
     @Override
     public List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq) {
+
         List<SysCarVo> sysCarVos = sysCarMapper.selectSysCarVoList(sysCarReq);
-        sysCarCacheService.put("List", sysCarVos);
+
+        sysCarVos.forEach(sysCarVo -> {
+            sysCarCacheService.put(String.valueOf(sysCarVo.getId()), sysCarVo);
+        });
+
         return sysCarVos;
     }
 
     @Override
     public SysCarVo selectSysCarVoById(Long id) {
         SysCarVo sysCarVo = sysCarMapper.selectSysCarVoById(id);
+
+        if (sysCarVo!=null){
+            sysCarCacheService.put(String.valueOf(sysCarVo.getId()), sysCarVo);
+        }
+
         return sysCarVo;
     }
 
     @Override
     public int addSysCar(SysCar sysCar) {
+
         int rows = sysCarMapper.insert(sysCar);
+
+        if (rows>0){
+            sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
+        }
+
         return rows;
     }
 
     @Override
     public int deleteSysCarById(Long id) {
+
         int rows = sysCarMapper.deleteById(id);
+
+        sysCarCacheService.remove(String.valueOf(id));
+
         return rows;
     }
 
     @Override
     public int updateSysCar(SysCar sysCar) {
+
         int rows = sysCarMapper.updateById(sysCar);
+
+        sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
+
         return rows;
     }
 
@@ -67,6 +90,11 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> impleme
         QueryWrapper<SysCar> sysCarQueryWrapper = new QueryWrapper<>();
         sysCarQueryWrapper.eq("car_vin", carVin);
         List<SysCar> sysCars = sysCarMapper.selectList(sysCarQueryWrapper);
+
+        sysCars.forEach(sysCar -> {
+            sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
+        });
+
         return sysCars.isEmpty() ? null : sysCars.get(0);
     }
 

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java

@@ -1,5 +1,6 @@
 package com.muyu.server.service.impl;
 
+import com.muyu.cache.MessageTemplateCacheService;
 import com.muyu.cache.MessageTemplateTypeCacheService;
 import com.muyu.common.domain.MessageTemplateType;
 import com.muyu.server.mapper.TemplateNeedMapper;
@@ -22,9 +23,19 @@ public class TemplateNeedServiceImpl implements TemplateNeedService {
     @Autowired
     private TemplateNeedMapper templateNeedMapper;
 
+    @Autowired
+    private MessageTemplateTypeCacheService messageTemplateTypeCacheService;
+
+
     @Override
     public List<MessageTemplateType> selectByTemplateId(Long templateId) {
+
         List<MessageTemplateType> messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId);
+
+        messageTemplateTypes.forEach(messageTemplateType -> {
+            messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
+        });
+
         return messageTemplateTypes;
     }
 }

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java

@@ -43,6 +43,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private SysCarCacheService sysCarCacheService;
+
+
     @Override
     public void messageParsing(String templateMessage) throws SQLException, IoTDBConnectionException, ClassNotFoundException, StatementExecutionException, ExecutionException, InterruptedException {
 
@@ -65,6 +69,11 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
         //根据VIN码获取车辆信息
         SysCar carByVin = sysCarService.findCarByVin(carVin);
         log.info("车辆信息为:" + carByVin);
+
+
+        sysCarCacheService.put(carVin,carByVin);
+
+
         //对应车辆所对应的报文模版
         Integer templateId = carByVin.getTemplateId();
         List<MessageTemplateType> templateTypeList;

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java

@@ -25,9 +25,11 @@ public class WarnRuleServiceImpl
     @Autowired
     private WarnRuleMapper warnRuleMapper;
 
+
     @Autowired
     private WarnRuleCacheService warnRuleCacheService;
 
+
     /**
      * 精确查询预警规则
      *
@@ -38,6 +40,9 @@ public class WarnRuleServiceImpl
     public WarnRule selectWarnRuleById(Long id)
     {
         WarnRule warnRule = warnRuleMapper.selectById(id);
+
+        warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
+
         return warnRule;
     }
 
@@ -52,26 +57,44 @@ public class WarnRuleServiceImpl
     public List<WarnRuleResp> selectWarnRuleRespList()
     {
         List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectWarnRuleRespList();
-        warnRuleCacheService.put("List",warnRuleResps);
+        warnRuleResps.forEach(warnRuleResp -> {
+            warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp);
+        });
         return warnRuleResps;
     }
 
     @Override
     public Integer addWarnRule(WarnRule warnRule) {
+
         int rows = warnRuleMapper.insert(warnRule);
+
+        if (rows>0){
+            warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
+        }
+
         return rows;
     }
 
     @Override
     public Integer updWarnRule(WarnRule warnRule) {
         LambdaQueryWrapper<WarnRule> queryWrapper = new LambdaQueryWrapper<>();
+
         Integer update = warnRuleMapper.update(queryWrapper);
+
+        warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
+
         return update;
     }
 
     @Override
     public List<WarnRuleResp> selectListByStrategyId(Long strategyId) {
+
         List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectListByStrategyId(strategyId);
+
+        warnRuleResps.forEach(warnRuleResp -> {
+            warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp);
+        });
+
         return warnRuleResps;
     }
 

cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java

@@ -39,6 +39,9 @@ public class WarnStrategyServiceImpl
     public WarnStrategy selectWarnStrategyById(Long id)
     {
         WarnStrategy warnStrategy = warnStrategyMapper.selectById(id);
+
+        warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy);
+
         return warnStrategy;
     }
 
@@ -53,13 +56,21 @@ public class WarnStrategyServiceImpl
     public List<WarnStrategyResp> selectWarnStrategyList(WarnStrategyReq warnStrategyReq)
     {
         List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectWarnStrategyList(warnStrategyReq);
-        warnStrategyCacheService.put("List",warnStrategyResps);
+
+        warnStrategyResps.forEach(warnStrategyResp -> {
+            warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp);
+        });
+
         return warnStrategyResps;
     }
 
     @Override
     public Integer deleteWarnStrategy(Long id) {
+
         int rows = warnStrategyMapper.deleteById(id);
+
+        warnStrategyCacheService.remove(String.valueOf(id));
+
         return rows;
     }
 
@@ -70,7 +81,11 @@ public class WarnStrategyServiceImpl
     @Override
     public Integer updWarnStrategy(WarnStrategy warnStrategy){
         QueryWrapper<WarnStrategy> wrapper = new QueryWrapper<>(warnStrategy);
+
         Integer update = warnStrategyMapper.update(wrapper);
+
+        warnStrategyCacheService.remove(String.valueOf(warnStrategy.getId()));
+
         return update;
     }
 
@@ -79,7 +94,11 @@ public class WarnStrategyServiceImpl
      */
     @Override
     public Integer addWarnStrategy(WarnStrategy warnStrategy){
+
         int rows = warnStrategyMapper.insert(warnStrategy);
+
+        warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy);
+
         return rows;
     }
 
@@ -90,7 +109,13 @@ public class WarnStrategyServiceImpl
      */
     @Override
     public List<WarnStrategyResp> selectListByCarType(Long carTypeId) {
+
         List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectListByCarType(carTypeId);
+
+        warnStrategyResps.forEach(warnStrategyResp -> {
+            warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp);
+        });
+
         return warnStrategyResps;
     }