From 3a8b35b710fbfdaa63d4a71e1049cb8502811b5a Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Wed, 2 Oct 2024 16:21:58 +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 --- .../service/impl/CarTypeServiceImpl.java | 16 +---- .../impl/ElectronicFenceGroupServiceImpl.java | 8 +-- .../impl/ElectronicFenceServiceImpl.java | 70 +++++-------------- .../service/impl/EnterpriseServiceImpl.java | 16 +---- .../impl/MessageTemplateTypeServiceImpl.java | 27 +------ .../impl/SysCarFaultMessageServiceImpl.java | 15 +--- .../service/impl/SysCarFaultServiceImpl.java | 10 +-- .../service/impl/SysCarServiceImpl.java | 32 +-------- .../service/impl/TemplateNeedServiceImpl.java | 11 --- .../service/impl/TemplateServiceImpl.java | 9 --- .../service/impl/WarnRuleServiceImpl.java | 25 +------ .../service/impl/WarnStrategyServiceImpl.java | 27 +------ 12 files changed, 26 insertions(+), 240 deletions(-) diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java index d1ba699..5e6cd80 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java @@ -34,9 +34,7 @@ public class CarTypeServiceImpl extends ServiceImpl impl QueryWrapper carTypeQueryWrapper = new QueryWrapper<>(); List list = carTypeMapper.selectList(carTypeQueryWrapper); - for (CarType carType : list) { - carTypeCacheService.put(carTypeCacheService.keyPre() + carType.getId(), carType); - } + carTypeCacheService.put("List", list); return list; } @@ -44,9 +42,6 @@ public class CarTypeServiceImpl extends ServiceImpl impl @Override public CarTypeResp selectCarTypeRespList(Long id) { CarTypeResp carTypeResp = carTypeMapper.selectCarTypeRespList(id); - - carTypeCacheService.put(carTypeCacheService.keyPre() + id, carTypeResp); - return carTypeResp; } @@ -55,21 +50,12 @@ public class CarTypeServiceImpl extends ServiceImpl impl QueryWrapper 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 findAllCars() { - List allCars = carTypeMapper.findAllCars(); - - for (CarTypeResp carTypeResp : allCars) { - carTypeCacheService.put(carTypeCacheService.keyPre() + carTypeResp.getId(), carTypeResp); - } - return allCars; } } 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 99c1000..ac9bf49 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 @@ -60,9 +60,7 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl list = this.list(queryWrapper); - list.forEach(electronicFenceGroup -> { - electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup); - }); + electronicFenceGroupCacheService.put("List",list); return list; @@ -85,10 +83,6 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl 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 list = this.list(queryWrapper); - list.forEach(electronicFence -> { - electronicFenceCacheService.put(electronicFence.getId().toString(), electronicFence); - }); + electronicFenceCacheService.put("List", list); - ElectronicFence electronicFence = electronicFenceCacheService.get("electronicFence"); - log.info("electronicFenceCacheService.get(electronicFence) = {}",electronicFence); + List electronicFenceList = electronicFenceCacheService.get("electronicFenceList"); + log.info("electronicFenceCacheService.get(electronicFenceList) = {}", electronicFenceList); return list.stream().map(ElectronicFence::bullerResp).toList(); } @Override public void AddFence(ElectroicFenceAddReq electroicFenceAddReq) { - - electronicFenceMapper.insert(ElectronicFence.buildElectroicAdd(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 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 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 fenceArray() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - LambdaQueryWrapper wrapper = queryWrapper.eq(ElectronicFence::getStatus, 0); - List 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 queryWrapper = new LambdaQueryWrapper<>(); - - queryWrapper.eq(ElectronicFence::getName,name); - + queryWrapper.eq(ElectronicFence::getName, name); List fenceList = this.list(queryWrapper); - - electronicFenceCacheService.remove(name); - - if (fenceList.size()>0){ + if (fenceList.size() > 0) { throw new RuntimeException("电子围栏名不能重复"); } - - } @Override public List selectListByIds(List ids) { - List 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(); + 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 2749609..5f98fb8 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 @@ -34,7 +34,7 @@ public class EnterpriseServiceImpl implements EnterpriseService { */ @Override public PageUtils selectEnterprise(Map param) { - ArrayList list = new ArrayList<>(); + List list = new ArrayList<>(); long count = enterpriseDao.selectEnterpriseCount(); if (count > 0){ list = enterpriseDao.selectEnterprise(param); @@ -54,9 +54,6 @@ 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; } @@ -69,12 +66,6 @@ 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; } @@ -87,9 +78,6 @@ 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; } @@ -104,10 +92,8 @@ 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; } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/MessageTemplateTypeServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/MessageTemplateTypeServiceImpl.java index 5032f42..e2be24d 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/MessageTemplateTypeServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/MessageTemplateTypeServiceImpl.java @@ -27,9 +27,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper); - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); + messageTemplateTypeCacheService.put("List",messageTemplateTypes); return messageTemplateTypes; } @@ -54,11 +49,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper); - - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); - return messageTemplateTypes; } @@ -68,11 +58,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper); - - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); - return messageTemplateTypes; } @@ -82,11 +67,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl messageTemplateTypeQueryWrapper = new QueryWrapper<>(); messageTemplateTypeQueryWrapper.eq("template_id",templatedId); List messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper); - - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); - return messageTemplateTypes; } @@ -95,11 +75,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl messageTemplateTypeQueryWrapper = new QueryWrapper<>(); messageTemplateTypeQueryWrapper.eq("template_id",templateId); List messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper); - - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); - return messageTemplateTypes; } } 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 6f96b2d..9915f77 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 @@ -38,9 +38,7 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl list = baseMapper.selectList(wrapper); - list.forEach(item->{ - sysCarFaultMessageCacheService.put(item.getContent(),item); - }); + sysCarFaultMessageCacheService.put("List",list); return list; } @@ -53,11 +51,6 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl listStatusOnt( ) { List list = baseMapper.listStatusOnt(); - - list.forEach(item->{ - sysCarFaultMessageCacheService.put(item.getContent(),item); - }); - return list; } @@ -67,13 +60,7 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl 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 f7eb1af..7c56486 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 @@ -43,9 +43,6 @@ 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); } @@ -80,9 +77,7 @@ public class SysCarFaultServiceImpl List list = this.list(queryWrapper); - list.forEach(sysCarFault1 -> { - sysCarFaultCacheService.put(sysCarFault1.getId().toString(),sysCarFault1); - }); + sysCarFaultCacheService.put("List",list); return list; } @@ -97,9 +92,6 @@ public class SysCarFaultServiceImpl @Override public SysCarFault selectFaultByFaultCode(String faultCode) { - - sysCarFaultCacheService.put(faultCode,mapper.selectFaultByFaultCode(faultCode)); - return mapper.selectFaultByFaultCode(faultCode); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java index 9779e94..46bc9f4 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java @@ -13,6 +13,7 @@ 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") @@ -27,56 +28,32 @@ public class SysCarServiceImpl extends ServiceImpl impleme @Override public List selectSysCarVoList(SysCarReq sysCarReq) { - List sysCarVos = sysCarMapper.selectSysCarVoList(sysCarReq); - - sysCarVos.forEach(sysCarVo -> { - sysCarCacheService.put(String.valueOf(sysCarVo.getId()), sysCarVo); - }); - + sysCarCacheService.put("List", sysCarVos); 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; } @@ -90,11 +67,6 @@ public class SysCarServiceImpl extends ServiceImpl impleme QueryWrapper sysCarQueryWrapper = new QueryWrapper<>(); sysCarQueryWrapper.eq("car_vin", carVin); List sysCars = sysCarMapper.selectList(sysCarQueryWrapper); - - sysCars.forEach(sysCar -> { - sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar); - }); - return sysCars.isEmpty() ? null : sysCars.get(0); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java index e29810e..c155338 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java @@ -1,6 +1,5 @@ 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; @@ -23,19 +22,9 @@ public class TemplateNeedServiceImpl implements TemplateNeedService { @Autowired private TemplateNeedMapper templateNeedMapper; - @Autowired - private MessageTemplateTypeCacheService messageTemplateTypeCacheService; - - @Override public List selectByTemplateId(Long templateId) { - List messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId); - - messageTemplateTypes.forEach(messageTemplateType -> { - messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType); - }); - return messageTemplateTypes; } } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java index 7020e45..091631d 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java @@ -43,10 +43,6 @@ public class TemplateServiceImpl extends ServiceImpl i @Autowired private RedisTemplate redisTemplate; - @Autowired - private SysCarCacheService sysCarCacheService; - - @Override public void messageParsing(String templateMessage) throws SQLException, IoTDBConnectionException, ClassNotFoundException, StatementExecutionException, ExecutionException, InterruptedException { @@ -69,11 +65,6 @@ public class TemplateServiceImpl extends ServiceImpl i //根据VIN码获取车辆信息 SysCar carByVin = sysCarService.findCarByVin(carVin); log.info("车辆信息为:" + carByVin); - - - sysCarCacheService.put(carVin,carByVin); - - //对应车辆所对应的报文模版 Integer templateId = carByVin.getTemplateId(); List templateTypeList; diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java index dfeaee8..1a662f4 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java @@ -25,11 +25,9 @@ public class WarnRuleServiceImpl @Autowired private WarnRuleMapper warnRuleMapper; - @Autowired private WarnRuleCacheService warnRuleCacheService; - /** * 精确查询预警规则 * @@ -40,9 +38,6 @@ public class WarnRuleServiceImpl public WarnRule selectWarnRuleById(Long id) { WarnRule warnRule = warnRuleMapper.selectById(id); - - warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule); - return warnRule; } @@ -57,44 +52,26 @@ public class WarnRuleServiceImpl public List selectWarnRuleRespList() { List warnRuleResps = warnRuleMapper.selectWarnRuleRespList(); - warnRuleResps.forEach(warnRuleResp -> { - warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp); - }); + warnRuleCacheService.put("List",warnRuleResps); 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 queryWrapper = new LambdaQueryWrapper<>(); - Integer update = warnRuleMapper.update(queryWrapper); - - warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule); - return update; } @Override public List selectListByStrategyId(Long strategyId) { - List warnRuleResps = warnRuleMapper.selectListByStrategyId(strategyId); - - warnRuleResps.forEach(warnRuleResp -> { - warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp); - }); - return warnRuleResps; } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java index 39b184c..bb2b46b 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java @@ -39,9 +39,6 @@ public class WarnStrategyServiceImpl public WarnStrategy selectWarnStrategyById(Long id) { WarnStrategy warnStrategy = warnStrategyMapper.selectById(id); - - warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy); - return warnStrategy; } @@ -56,21 +53,13 @@ public class WarnStrategyServiceImpl public List selectWarnStrategyList(WarnStrategyReq warnStrategyReq) { List warnStrategyResps = warnStrategyMapper.selectWarnStrategyList(warnStrategyReq); - - warnStrategyResps.forEach(warnStrategyResp -> { - warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp); - }); - + warnStrategyCacheService.put("List",warnStrategyResps); return warnStrategyResps; } @Override public Integer deleteWarnStrategy(Long id) { - int rows = warnStrategyMapper.deleteById(id); - - warnStrategyCacheService.remove(String.valueOf(id)); - return rows; } @@ -81,11 +70,7 @@ public class WarnStrategyServiceImpl @Override public Integer updWarnStrategy(WarnStrategy warnStrategy){ QueryWrapper wrapper = new QueryWrapper<>(warnStrategy); - Integer update = warnStrategyMapper.update(wrapper); - - warnStrategyCacheService.remove(String.valueOf(warnStrategy.getId())); - return update; } @@ -94,11 +79,7 @@ public class WarnStrategyServiceImpl */ @Override public Integer addWarnStrategy(WarnStrategy warnStrategy){ - int rows = warnStrategyMapper.insert(warnStrategy); - - warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy); - return rows; } @@ -109,13 +90,7 @@ public class WarnStrategyServiceImpl */ @Override public List selectListByCarType(Long carTypeId) { - List warnStrategyResps = warnStrategyMapper.selectListByCarType(carTypeId); - - warnStrategyResps.forEach(warnStrategyResp -> { - warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp); - }); - return warnStrategyResps; }