group-four
/
cloud-car
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():把saas缓存对象换成缓存列表

dev.operation
86191 2024-10-02 16:21:58 +08:00
parent 59050208a0
commit 3a8b35b710
12 changed files with 26 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,9 +34,7 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
List<CarType> 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<CarTypeMapper, CarType> 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<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;
}
}

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

@ -60,9 +60,7 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl<ElectronicFence
);
List<ElectronicFenceGroup> 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<ElectronicFence
electronicFenceGroupResp.setElectronicFenceRespList(electronicFenceRespList);
}
electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup);
return electronicFenceGroupResp;
}

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

@ -21,6 +21,7 @@ import java.util.List;
/**
* 电子围栏 服务层处理
*
* @author yuping
* @Package：com.muyu.fence.service.impl
* @Project：cloud-server
@ -54,46 +55,35 @@ public class ElectronicFenceServiceImpl extends ServiceImpl<ElectronicFenceMappe
);
List<ElectronicFence> 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<ElectronicFence> 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));
}
@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);
}
@Override
@ -103,67 +93,39 @@ public class ElectronicFenceServiceImpl extends ServiceImpl<ElectronicFenceMappe
public void updateStatus(Long id, int status) {
UpdateWrapper<ElectronicFence> updateWrapper = new UpdateWrapper<>();
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);
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);
List<ElectronicFence> fenceList = this.list(queryWrapper);
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();
}
}

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

@ -34,7 +34,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
*/
@Override
public PageUtils selectEnterprise(Map param) {
ArrayList<HashMap> list = new ArrayList<>();
List<HashMap> 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;
}

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

@ -27,9 +27,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
@Override
public Integer addMessageType(MessageTemplateType messageTemplateType) {
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
return messageTemplateTypeMapper.insert(messageTemplateType);
}
@ -41,9 +38,7 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
messageTemplateTypeQueryWrapper.eq("message_class",code);
List<MessageTemplateType> 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<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;
}
@ -68,11 +58,6 @@ 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;
}
@ -82,11 +67,6 @@ 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;
}
@ -95,11 +75,6 @@ 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;
}
}

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

@ -38,9 +38,7 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
List<SysCarFaultMessage> 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<SysCarFaultMessag
public List<SysCarFaultMessage> listStatusOnt( ) {
List<SysCarFaultMessage> list = baseMapper.listStatusOnt();
list.forEach(item->{
sysCarFaultMessageCacheService.put(item.getContent(),item);
});
return list;
}
@ -67,13 +60,7 @@ 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;
}
}

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

@ -43,9 +43,6 @@ 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);
}
@ -80,9 +77,7 @@ public class SysCarFaultServiceImpl
List<SysCarFault> 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);
}

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

@ -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<SysCarMapper, SysCar> impleme
@Override
public List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq) {
List<SysCarVo> 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<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);
}

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

@ -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<MessageTemplateType> selectByTemplateId(Long templateId) {
List<MessageTemplateType> messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId);
messageTemplateTypes.forEach(messageTemplateType -> {
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
});
return messageTemplateTypes;
}
}

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

@ -43,10 +43,6 @@ 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 {
@ -69,11 +65,6 @@ 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;

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

@ -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<WarnRuleResp> selectWarnRuleRespList()
{
List<WarnRuleResp> 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<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;
}

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

@ -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<WarnStrategyResp> selectWarnStrategyList(WarnStrategyReq warnStrategyReq)
{
List<WarnStrategyResp> 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<WarnStrategy> 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<WarnStrategyResp> selectListByCarType(Long carTypeId) {
List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectListByCarType(carTypeId);
warnStrategyResps.forEach(warnStrategyResp -> {
warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp);
});
return warnStrategyResps;
}