fix():把saas缓存对象换成缓存列表
parent
59050208a0
commit
3a8b35b710
|
@ -34,9 +34,7 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
|
||||||
QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
|
||||||
List<CarType> list = carTypeMapper.selectList(carTypeQueryWrapper);
|
List<CarType> list = carTypeMapper.selectList(carTypeQueryWrapper);
|
||||||
|
|
||||||
for (CarType carType : list) {
|
carTypeCacheService.put("List", list);
|
||||||
carTypeCacheService.put(carTypeCacheService.keyPre() + carType.getId(), carType);
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
@ -44,9 +42,6 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
|
||||||
@Override
|
@Override
|
||||||
public CarTypeResp selectCarTypeRespList(Long id) {
|
public CarTypeResp selectCarTypeRespList(Long id) {
|
||||||
CarTypeResp carTypeResp = carTypeMapper.selectCarTypeRespList(id);
|
CarTypeResp carTypeResp = carTypeMapper.selectCarTypeRespList(id);
|
||||||
|
|
||||||
carTypeCacheService.put(carTypeCacheService.keyPre() + id, carTypeResp);
|
|
||||||
|
|
||||||
return carTypeResp;
|
return carTypeResp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,21 +50,12 @@ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> impl
|
||||||
QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<CarType> carTypeQueryWrapper = new QueryWrapper<>();
|
||||||
carTypeQueryWrapper.eq("car_type_id", carTypeId);
|
carTypeQueryWrapper.eq("car_type_id", carTypeId);
|
||||||
CarType carType = carTypeMapper.selectOne(carTypeQueryWrapper);
|
CarType carType = carTypeMapper.selectOne(carTypeQueryWrapper);
|
||||||
|
|
||||||
carTypeCacheService.put(carTypeCacheService.keyPre() + carTypeId, carType);
|
|
||||||
|
|
||||||
return carType;
|
return carType;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CarTypeResp> findAllCars() {
|
public List<CarTypeResp> findAllCars() {
|
||||||
|
|
||||||
List<CarTypeResp> allCars = carTypeMapper.findAllCars();
|
List<CarTypeResp> allCars = carTypeMapper.findAllCars();
|
||||||
|
|
||||||
for (CarTypeResp carTypeResp : allCars) {
|
|
||||||
carTypeCacheService.put(carTypeCacheService.keyPre() + carTypeResp.getId(), carTypeResp);
|
|
||||||
}
|
|
||||||
|
|
||||||
return allCars;
|
return allCars;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,9 +60,7 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl<ElectronicFence
|
||||||
);
|
);
|
||||||
List<ElectronicFenceGroup> list = this.list(queryWrapper);
|
List<ElectronicFenceGroup> list = this.list(queryWrapper);
|
||||||
|
|
||||||
list.forEach(electronicFenceGroup -> {
|
electronicFenceGroupCacheService.put("List",list);
|
||||||
electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
|
|
||||||
|
@ -85,10 +83,6 @@ public class ElectronicFenceGroupServiceImpl extends ServiceImpl<ElectronicFence
|
||||||
|
|
||||||
electronicFenceGroupResp.setElectronicFenceRespList(electronicFenceRespList);
|
electronicFenceGroupResp.setElectronicFenceRespList(electronicFenceRespList);
|
||||||
}
|
}
|
||||||
|
|
||||||
electronicFenceGroupCacheService.put(electronicFenceGroup.getId().toString(),electronicFenceGroup);
|
|
||||||
|
|
||||||
|
|
||||||
return electronicFenceGroupResp;
|
return electronicFenceGroupResp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 电子围栏 服务层处理
|
* 电子围栏 服务层处理
|
||||||
|
*
|
||||||
* @author yuping
|
* @author yuping
|
||||||
* @Package:com.muyu.fence.service.impl
|
* @Package:com.muyu.fence.service.impl
|
||||||
* @Project:cloud-server
|
* @Project:cloud-server
|
||||||
|
@ -44,126 +45,87 @@ public class ElectronicFenceServiceImpl extends ServiceImpl<ElectronicFenceMappe
|
||||||
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
||||||
queryWrapper.like(
|
queryWrapper.like(
|
||||||
StringUtils.isNotEmpty(electroicFenceListReq.getName()),ElectronicFence::getName, electroicFenceListReq.getName()
|
StringUtils.isNotEmpty(electroicFenceListReq.getName()), ElectronicFence::getName, electroicFenceListReq.getName()
|
||||||
);
|
);
|
||||||
queryWrapper.eq(
|
queryWrapper.eq(
|
||||||
StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()),ElectronicFence::getFenceType, electroicFenceListReq.getFenceType()
|
StringUtils.isNotEmpty(electroicFenceListReq.getFenceType()), ElectronicFence::getFenceType, electroicFenceListReq.getFenceType()
|
||||||
);
|
);
|
||||||
queryWrapper.eq(
|
queryWrapper.eq(
|
||||||
StringUtils.isNotEmpty(electroicFenceListReq.getStatus()),ElectronicFence::getStatus, electroicFenceListReq.getStatus()
|
StringUtils.isNotEmpty(electroicFenceListReq.getStatus()), ElectronicFence::getStatus, electroicFenceListReq.getStatus()
|
||||||
);
|
);
|
||||||
List<ElectronicFence> list = this.list(queryWrapper);
|
List<ElectronicFence> list = this.list(queryWrapper);
|
||||||
|
|
||||||
list.forEach(electronicFence -> {
|
electronicFenceCacheService.put("List", list);
|
||||||
electronicFenceCacheService.put(electronicFence.getId().toString(), electronicFence);
|
|
||||||
});
|
|
||||||
|
|
||||||
ElectronicFence electronicFence = electronicFenceCacheService.get("electronicFence");
|
List<ElectronicFence> electronicFenceList = electronicFenceCacheService.get("electronicFenceList");
|
||||||
log.info("electronicFenceCacheService.get(electronicFence) = {}",electronicFence);
|
log.info("electronicFenceCacheService.get(electronicFenceList) = {}", electronicFenceList);
|
||||||
|
|
||||||
return list.stream().map(ElectronicFence::bullerResp).toList();
|
return list.stream().map(ElectronicFence::bullerResp).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void AddFence(ElectroicFenceAddReq electroicFenceAddReq) {
|
public void AddFence(ElectroicFenceAddReq electroicFenceAddReq) {
|
||||||
|
|
||||||
electronicFenceMapper.insert(ElectronicFence.buildElectroicAdd(electroicFenceAddReq));
|
electronicFenceMapper.insert(ElectronicFence.buildElectroicAdd(electroicFenceAddReq));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ElectronicFence findElectronicByid(Long id) {
|
public ElectronicFence findElectronicByid(Long id) {
|
||||||
|
|
||||||
ElectronicFence electronicFence = electronicFenceMapper.selectById(id);
|
ElectronicFence electronicFence = electronicFenceMapper.selectById(id);
|
||||||
|
|
||||||
electronicFenceCacheService.put(id.toString(),electronicFence);
|
|
||||||
|
|
||||||
return electronicFence;
|
return electronicFence;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delElectronById(Long id) {
|
public void delElectronById(Long id) {
|
||||||
|
|
||||||
electronicFenceCacheService.remove(id.toString());
|
electronicFenceCacheService.remove(id.toString());
|
||||||
|
|
||||||
electronicFenceMapper.deleteById(id);
|
electronicFenceMapper.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void openFence(Long id) {
|
public void openFence(Long id) {
|
||||||
|
updateStatus(id, 0);
|
||||||
updateStatus(id,0);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void closeFence(Long id) {
|
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<ElectronicFence> updateWrapper = new UpdateWrapper<>();
|
||||||
|
updateWrapper.eq("id", id).set("status", status);
|
||||||
updateWrapper.eq("id",id).set("status",status);
|
|
||||||
|
|
||||||
this.update(updateWrapper);
|
this.update(updateWrapper);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFenceWay(Long id, String longitudeLatitude) {
|
public void setFenceWay(Long id, String longitudeLatitude) {
|
||||||
|
|
||||||
UpdateWrapper<ElectronicFence> updateWrapper = new UpdateWrapper<>();
|
UpdateWrapper<ElectronicFence> updateWrapper = new UpdateWrapper<>();
|
||||||
|
updateWrapper.eq("id", id).set("longitude_latitude", longitudeLatitude);
|
||||||
updateWrapper.eq("id",id).set("longitude_latitude",longitudeLatitude);
|
|
||||||
|
|
||||||
this.update(updateWrapper);
|
this.update(updateWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ElectronicFenceResp> fenceArray() {
|
public List<ElectronicFenceResp> fenceArray() {
|
||||||
|
|
||||||
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
||||||
LambdaQueryWrapper<ElectronicFence> wrapper = queryWrapper.eq(ElectronicFence::getStatus, 0);
|
LambdaQueryWrapper<ElectronicFence> wrapper = queryWrapper.eq(ElectronicFence::getStatus, 0);
|
||||||
|
|
||||||
List<ElectronicFence> list = this.list(wrapper);
|
List<ElectronicFence> list = this.list(wrapper);
|
||||||
|
|
||||||
list.forEach(electronicFence -> {
|
|
||||||
electronicFenceCacheService.put(electronicFence.getId().toString(),electronicFence);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list.stream().map(ElectronicFence::bullerResp).toList();
|
return list.stream().map(ElectronicFence::bullerResp).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unquireFence(String name) {
|
public void unquireFence(String name) {
|
||||||
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ElectronicFence> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.eq(ElectronicFence::getName, name);
|
||||||
queryWrapper.eq(ElectronicFence::getName,name);
|
|
||||||
|
|
||||||
List<ElectronicFence> fenceList = this.list(queryWrapper);
|
List<ElectronicFence> fenceList = this.list(queryWrapper);
|
||||||
|
if (fenceList.size() > 0) {
|
||||||
electronicFenceCacheService.remove(name);
|
|
||||||
|
|
||||||
if (fenceList.size()>0){
|
|
||||||
throw new RuntimeException("电子围栏名不能重复");
|
throw new RuntimeException("电子围栏名不能重复");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ElectronicFenceResp> selectListByIds(List<Long> ids) {
|
public List<ElectronicFenceResp> selectListByIds(List<Long> ids) {
|
||||||
|
|
||||||
List<ElectronicFence> electronicFenceList = this.list(Wrappers.<ElectronicFence>lambdaQuery().in(ElectronicFence::getId, 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();
|
return electronicFenceList.stream().map(ElectronicFence::bullerResp).toList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public PageUtils selectEnterprise(Map param) {
|
public PageUtils selectEnterprise(Map param) {
|
||||||
ArrayList<HashMap> list = new ArrayList<>();
|
List<HashMap> list = new ArrayList<>();
|
||||||
long count = enterpriseDao.selectEnterpriseCount();
|
long count = enterpriseDao.selectEnterpriseCount();
|
||||||
if (count > 0){
|
if (count > 0){
|
||||||
list = enterpriseDao.selectEnterprise(param);
|
list = enterpriseDao.selectEnterprise(param);
|
||||||
|
@ -54,9 +54,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
||||||
@Override
|
@Override
|
||||||
public int insert(Enterprise enterprise) {
|
public int insert(Enterprise enterprise) {
|
||||||
int rows = enterpriseDao.insert(enterprise);
|
int rows = enterpriseDao.insert(enterprise);
|
||||||
if (rows > 0){
|
|
||||||
enterpriseCacheService.put(String.valueOf(enterprise.getEnterpriseId()), enterprise);
|
|
||||||
}
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,12 +66,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
||||||
@Override
|
@Override
|
||||||
public HashMap searchById(int enterpriseId) {
|
public HashMap searchById(int enterpriseId) {
|
||||||
HashMap map = enterpriseDao.searchById(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;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,9 +78,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
||||||
@Override
|
@Override
|
||||||
public int updateEnterprise(Enterprise enterprise) {
|
public int updateEnterprise(Enterprise enterprise) {
|
||||||
int rows = enterpriseDao.updateEnterprise(enterprise);
|
int rows = enterpriseDao.updateEnterprise(enterprise);
|
||||||
if (rows > 0){
|
|
||||||
enterpriseCacheService.put(String.valueOf(enterprise.getEnterpriseId()), enterprise);
|
|
||||||
}
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,10 +92,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
||||||
if (ids == null || ids.length == 0) {
|
if (ids == null || ids.length == 0) {
|
||||||
throw new IllegalArgumentException("请选择要删除的企业名称编号");
|
throw new IllegalArgumentException("请选择要删除的企业名称编号");
|
||||||
}
|
}
|
||||||
|
|
||||||
Integer[] idList = Arrays.asList(ids).toArray(new Integer[0]);
|
Integer[] idList = Arrays.asList(ids).toArray(new Integer[0]);
|
||||||
int rows = enterpriseDao.deleteByIds(idList);
|
int rows = enterpriseDao.deleteByIds(idList);
|
||||||
enterpriseCacheService.remove(String.valueOf(idList));
|
|
||||||
return rows;
|
return rows;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,9 +27,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer addMessageType(MessageTemplateType messageTemplateType) {
|
public Integer addMessageType(MessageTemplateType messageTemplateType) {
|
||||||
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
|
|
||||||
return messageTemplateTypeMapper.insert(messageTemplateType);
|
return messageTemplateTypeMapper.insert(messageTemplateType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,9 +38,7 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
||||||
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
messageTemplateTypeCacheService.put("List",messageTemplateTypes);
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
|
@ -54,11 +49,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
||||||
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
||||||
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,11 +58,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
||||||
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
messageTemplateTypeQueryWrapper.eq("message_class",code);
|
||||||
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,11 +67,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
|
||||||
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
messageTemplateTypeQueryWrapper.eq("template_id",templatedId);
|
||||||
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,11 +75,6 @@ public class MessageTemplateTypeServiceImpl extends ServiceImpl<MessageTemplate
|
||||||
QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<MessageTemplateType> messageTemplateTypeQueryWrapper = new QueryWrapper<>();
|
||||||
messageTemplateTypeQueryWrapper.eq("template_id",templateId);
|
messageTemplateTypeQueryWrapper.eq("template_id",templateId);
|
||||||
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
List<MessageTemplateType> messageTemplateTypes = messageTemplateTypeMapper.selectList(messageTemplateTypeQueryWrapper);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,9 +38,7 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
|
||||||
|
|
||||||
List<SysCarFaultMessage> list = baseMapper.selectList(wrapper);
|
List<SysCarFaultMessage> list = baseMapper.selectList(wrapper);
|
||||||
|
|
||||||
list.forEach(item->{
|
sysCarFaultMessageCacheService.put("List",list);
|
||||||
sysCarFaultMessageCacheService.put(item.getContent(),item);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
@ -53,11 +51,6 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
|
||||||
public List<SysCarFaultMessage> listStatusOnt( ) {
|
public List<SysCarFaultMessage> listStatusOnt( ) {
|
||||||
|
|
||||||
List<SysCarFaultMessage> list = baseMapper.listStatusOnt();
|
List<SysCarFaultMessage> list = baseMapper.listStatusOnt();
|
||||||
|
|
||||||
list.forEach(item->{
|
|
||||||
sysCarFaultMessageCacheService.put(item.getContent(),item);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,13 +60,7 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysCarFaultMessage> listStatusTwo( ) {
|
public List<SysCarFaultMessage> listStatusTwo( ) {
|
||||||
|
|
||||||
List<SysCarFaultMessage> list = baseMapper.listStatusTwo();
|
List<SysCarFaultMessage> list = baseMapper.listStatusTwo();
|
||||||
|
|
||||||
list.forEach(item->{
|
|
||||||
sysCarFaultMessageCacheService.put(item.getContent(),item);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,9 +43,6 @@ public class SysCarFaultServiceImpl
|
||||||
LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
Assert.notNull(id, "id不可为空");
|
Assert.notNull(id, "id不可为空");
|
||||||
queryWrapper.eq(SysCarFault::getId, id);
|
queryWrapper.eq(SysCarFault::getId, id);
|
||||||
|
|
||||||
sysCarFaultCacheService.put(id.toString(),this.getOne(queryWrapper));
|
|
||||||
|
|
||||||
return this.getOne(queryWrapper);
|
return this.getOne(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,9 +77,7 @@ public class SysCarFaultServiceImpl
|
||||||
|
|
||||||
List<SysCarFault> list = this.list(queryWrapper);
|
List<SysCarFault> list = this.list(queryWrapper);
|
||||||
|
|
||||||
list.forEach(sysCarFault1 -> {
|
sysCarFaultCacheService.put("List",list);
|
||||||
sysCarFaultCacheService.put(sysCarFault1.getId().toString(),sysCarFault1);
|
|
||||||
});
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
@ -97,9 +92,6 @@ public class SysCarFaultServiceImpl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SysCarFault selectFaultByFaultCode(String faultCode) {
|
public SysCarFault selectFaultByFaultCode(String faultCode) {
|
||||||
|
|
||||||
sysCarFaultCacheService.put(faultCode,mapper.selectFaultByFaultCode(faultCode));
|
|
||||||
|
|
||||||
return mapper.selectFaultByFaultCode(faultCode);
|
return mapper.selectFaultByFaultCode(faultCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ import com.muyu.server.service.SysCarService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@DS("lizzDB")
|
@DS("lizzDB")
|
||||||
|
@ -27,56 +28,32 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> impleme
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq) {
|
public List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq) {
|
||||||
|
|
||||||
List<SysCarVo> sysCarVos = sysCarMapper.selectSysCarVoList(sysCarReq);
|
List<SysCarVo> sysCarVos = sysCarMapper.selectSysCarVoList(sysCarReq);
|
||||||
|
sysCarCacheService.put("List", sysCarVos);
|
||||||
sysCarVos.forEach(sysCarVo -> {
|
|
||||||
sysCarCacheService.put(String.valueOf(sysCarVo.getId()), sysCarVo);
|
|
||||||
});
|
|
||||||
|
|
||||||
return sysCarVos;
|
return sysCarVos;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SysCarVo selectSysCarVoById(Long id) {
|
public SysCarVo selectSysCarVoById(Long id) {
|
||||||
SysCarVo sysCarVo = sysCarMapper.selectSysCarVoById(id);
|
SysCarVo sysCarVo = sysCarMapper.selectSysCarVoById(id);
|
||||||
|
|
||||||
if (sysCarVo!=null){
|
|
||||||
sysCarCacheService.put(String.valueOf(sysCarVo.getId()), sysCarVo);
|
|
||||||
}
|
|
||||||
|
|
||||||
return sysCarVo;
|
return sysCarVo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int addSysCar(SysCar sysCar) {
|
public int addSysCar(SysCar sysCar) {
|
||||||
|
|
||||||
int rows = sysCarMapper.insert(sysCar);
|
int rows = sysCarMapper.insert(sysCar);
|
||||||
|
|
||||||
if (rows>0){
|
|
||||||
sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
|
|
||||||
}
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int deleteSysCarById(Long id) {
|
public int deleteSysCarById(Long id) {
|
||||||
|
|
||||||
int rows = sysCarMapper.deleteById(id);
|
int rows = sysCarMapper.deleteById(id);
|
||||||
|
|
||||||
sysCarCacheService.remove(String.valueOf(id));
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int updateSysCar(SysCar sysCar) {
|
public int updateSysCar(SysCar sysCar) {
|
||||||
|
|
||||||
int rows = sysCarMapper.updateById(sysCar);
|
int rows = sysCarMapper.updateById(sysCar);
|
||||||
|
|
||||||
sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,11 +67,6 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> impleme
|
||||||
QueryWrapper<SysCar> sysCarQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<SysCar> sysCarQueryWrapper = new QueryWrapper<>();
|
||||||
sysCarQueryWrapper.eq("car_vin", carVin);
|
sysCarQueryWrapper.eq("car_vin", carVin);
|
||||||
List<SysCar> sysCars = sysCarMapper.selectList(sysCarQueryWrapper);
|
List<SysCar> sysCars = sysCarMapper.selectList(sysCarQueryWrapper);
|
||||||
|
|
||||||
sysCars.forEach(sysCar -> {
|
|
||||||
sysCarCacheService.put(String.valueOf(sysCar.getId()), sysCar);
|
|
||||||
});
|
|
||||||
|
|
||||||
return sysCars.isEmpty() ? null : sysCars.get(0);
|
return sysCars.isEmpty() ? null : sysCars.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package com.muyu.server.service.impl;
|
package com.muyu.server.service.impl;
|
||||||
|
|
||||||
import com.muyu.cache.MessageTemplateCacheService;
|
|
||||||
import com.muyu.cache.MessageTemplateTypeCacheService;
|
import com.muyu.cache.MessageTemplateTypeCacheService;
|
||||||
import com.muyu.common.domain.MessageTemplateType;
|
import com.muyu.common.domain.MessageTemplateType;
|
||||||
import com.muyu.server.mapper.TemplateNeedMapper;
|
import com.muyu.server.mapper.TemplateNeedMapper;
|
||||||
|
@ -23,19 +22,9 @@ public class TemplateNeedServiceImpl implements TemplateNeedService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private TemplateNeedMapper templateNeedMapper;
|
private TemplateNeedMapper templateNeedMapper;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MessageTemplateTypeCacheService messageTemplateTypeCacheService;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<MessageTemplateType> selectByTemplateId(Long templateId) {
|
public List<MessageTemplateType> selectByTemplateId(Long templateId) {
|
||||||
|
|
||||||
List<MessageTemplateType> messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId);
|
List<MessageTemplateType> messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId);
|
||||||
|
|
||||||
messageTemplateTypes.forEach(messageTemplateType -> {
|
|
||||||
messageTemplateTypeCacheService.put(messageTemplateType.getMessageTemplateTypeId(),messageTemplateType);
|
|
||||||
});
|
|
||||||
|
|
||||||
return messageTemplateTypes;
|
return messageTemplateTypes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,10 +43,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
|
||||||
@Autowired
|
@Autowired
|
||||||
private RedisTemplate redisTemplate;
|
private RedisTemplate redisTemplate;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysCarCacheService sysCarCacheService;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void messageParsing(String templateMessage) throws SQLException, IoTDBConnectionException, ClassNotFoundException, StatementExecutionException, ExecutionException, InterruptedException {
|
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码获取车辆信息
|
//根据VIN码获取车辆信息
|
||||||
SysCar carByVin = sysCarService.findCarByVin(carVin);
|
SysCar carByVin = sysCarService.findCarByVin(carVin);
|
||||||
log.info("车辆信息为:" + carByVin);
|
log.info("车辆信息为:" + carByVin);
|
||||||
|
|
||||||
|
|
||||||
sysCarCacheService.put(carVin,carByVin);
|
|
||||||
|
|
||||||
|
|
||||||
//对应车辆所对应的报文模版
|
//对应车辆所对应的报文模版
|
||||||
Integer templateId = carByVin.getTemplateId();
|
Integer templateId = carByVin.getTemplateId();
|
||||||
List<MessageTemplateType> templateTypeList;
|
List<MessageTemplateType> templateTypeList;
|
||||||
|
|
|
@ -25,11 +25,9 @@ public class WarnRuleServiceImpl
|
||||||
@Autowired
|
@Autowired
|
||||||
private WarnRuleMapper warnRuleMapper;
|
private WarnRuleMapper warnRuleMapper;
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private WarnRuleCacheService warnRuleCacheService;
|
private WarnRuleCacheService warnRuleCacheService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 精确查询预警规则
|
* 精确查询预警规则
|
||||||
*
|
*
|
||||||
|
@ -40,9 +38,6 @@ public class WarnRuleServiceImpl
|
||||||
public WarnRule selectWarnRuleById(Long id)
|
public WarnRule selectWarnRuleById(Long id)
|
||||||
{
|
{
|
||||||
WarnRule warnRule = warnRuleMapper.selectById(id);
|
WarnRule warnRule = warnRuleMapper.selectById(id);
|
||||||
|
|
||||||
warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
|
|
||||||
|
|
||||||
return warnRule;
|
return warnRule;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,44 +52,26 @@ public class WarnRuleServiceImpl
|
||||||
public List<WarnRuleResp> selectWarnRuleRespList()
|
public List<WarnRuleResp> selectWarnRuleRespList()
|
||||||
{
|
{
|
||||||
List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectWarnRuleRespList();
|
List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectWarnRuleRespList();
|
||||||
warnRuleResps.forEach(warnRuleResp -> {
|
warnRuleCacheService.put("List",warnRuleResps);
|
||||||
warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp);
|
|
||||||
});
|
|
||||||
return warnRuleResps;
|
return warnRuleResps;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer addWarnRule(WarnRule warnRule) {
|
public Integer addWarnRule(WarnRule warnRule) {
|
||||||
|
|
||||||
int rows = warnRuleMapper.insert(warnRule);
|
int rows = warnRuleMapper.insert(warnRule);
|
||||||
|
|
||||||
if (rows>0){
|
|
||||||
warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
|
|
||||||
}
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer updWarnRule(WarnRule warnRule) {
|
public Integer updWarnRule(WarnRule warnRule) {
|
||||||
LambdaQueryWrapper<WarnRule> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<WarnRule> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
||||||
Integer update = warnRuleMapper.update(queryWrapper);
|
Integer update = warnRuleMapper.update(queryWrapper);
|
||||||
|
|
||||||
warnRuleCacheService.put(String.valueOf(warnRule.getId()), warnRule);
|
|
||||||
|
|
||||||
return update;
|
return update;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<WarnRuleResp> selectListByStrategyId(Long strategyId) {
|
public List<WarnRuleResp> selectListByStrategyId(Long strategyId) {
|
||||||
|
|
||||||
List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectListByStrategyId(strategyId);
|
List<WarnRuleResp> warnRuleResps = warnRuleMapper.selectListByStrategyId(strategyId);
|
||||||
|
|
||||||
warnRuleResps.forEach(warnRuleResp -> {
|
|
||||||
warnRuleCacheService.put(warnRuleCacheService.keyPre() + warnRuleResp.getId(), warnRuleResp);
|
|
||||||
});
|
|
||||||
|
|
||||||
return warnRuleResps;
|
return warnRuleResps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,9 +39,6 @@ public class WarnStrategyServiceImpl
|
||||||
public WarnStrategy selectWarnStrategyById(Long id)
|
public WarnStrategy selectWarnStrategyById(Long id)
|
||||||
{
|
{
|
||||||
WarnStrategy warnStrategy = warnStrategyMapper.selectById(id);
|
WarnStrategy warnStrategy = warnStrategyMapper.selectById(id);
|
||||||
|
|
||||||
warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy);
|
|
||||||
|
|
||||||
return warnStrategy;
|
return warnStrategy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,21 +53,13 @@ public class WarnStrategyServiceImpl
|
||||||
public List<WarnStrategyResp> selectWarnStrategyList(WarnStrategyReq warnStrategyReq)
|
public List<WarnStrategyResp> selectWarnStrategyList(WarnStrategyReq warnStrategyReq)
|
||||||
{
|
{
|
||||||
List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectWarnStrategyList(warnStrategyReq);
|
List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectWarnStrategyList(warnStrategyReq);
|
||||||
|
warnStrategyCacheService.put("List",warnStrategyResps);
|
||||||
warnStrategyResps.forEach(warnStrategyResp -> {
|
|
||||||
warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp);
|
|
||||||
});
|
|
||||||
|
|
||||||
return warnStrategyResps;
|
return warnStrategyResps;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer deleteWarnStrategy(Long id) {
|
public Integer deleteWarnStrategy(Long id) {
|
||||||
|
|
||||||
int rows = warnStrategyMapper.deleteById(id);
|
int rows = warnStrategyMapper.deleteById(id);
|
||||||
|
|
||||||
warnStrategyCacheService.remove(String.valueOf(id));
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,11 +70,7 @@ public class WarnStrategyServiceImpl
|
||||||
@Override
|
@Override
|
||||||
public Integer updWarnStrategy(WarnStrategy warnStrategy){
|
public Integer updWarnStrategy(WarnStrategy warnStrategy){
|
||||||
QueryWrapper<WarnStrategy> wrapper = new QueryWrapper<>(warnStrategy);
|
QueryWrapper<WarnStrategy> wrapper = new QueryWrapper<>(warnStrategy);
|
||||||
|
|
||||||
Integer update = warnStrategyMapper.update(wrapper);
|
Integer update = warnStrategyMapper.update(wrapper);
|
||||||
|
|
||||||
warnStrategyCacheService.remove(String.valueOf(warnStrategy.getId()));
|
|
||||||
|
|
||||||
return update;
|
return update;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,11 +79,7 @@ public class WarnStrategyServiceImpl
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Integer addWarnStrategy(WarnStrategy warnStrategy){
|
public Integer addWarnStrategy(WarnStrategy warnStrategy){
|
||||||
|
|
||||||
int rows = warnStrategyMapper.insert(warnStrategy);
|
int rows = warnStrategyMapper.insert(warnStrategy);
|
||||||
|
|
||||||
warnStrategyCacheService.put(String.valueOf(warnStrategy.getId()), warnStrategy);
|
|
||||||
|
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,13 +90,7 @@ public class WarnStrategyServiceImpl
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<WarnStrategyResp> selectListByCarType(Long carTypeId) {
|
public List<WarnStrategyResp> selectListByCarType(Long carTypeId) {
|
||||||
|
|
||||||
List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectListByCarType(carTypeId);
|
List<WarnStrategyResp> warnStrategyResps = warnStrategyMapper.selectListByCarType(carTypeId);
|
||||||
|
|
||||||
warnStrategyResps.forEach(warnStrategyResp -> {
|
|
||||||
warnStrategyCacheService.put(warnStrategyCacheService.keyPre() + warnStrategyResp.getId(), warnStrategyResp);
|
|
||||||
});
|
|
||||||
|
|
||||||
return warnStrategyResps;
|
return warnStrategyResps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue