fix(): 修改故障规则命名
parent
3378b4c216
commit
8888b7430c
|
@ -1,8 +1,8 @@
|
||||||
package com.muyu.enterprise.cache;
|
package com.muyu.enterprise.cache;
|
||||||
|
|
||||||
import com.muyu.common.cache.config.CacheAbsBasic;
|
import com.muyu.common.cache.config.CacheAbsBasic;
|
||||||
import com.muyu.enterprise.domain.CarCompany;
|
import com.muyu.enterprise.domain.FaultRule;
|
||||||
import com.muyu.enterprise.domain.FaultType;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* redis故障业务层
|
* redis故障业务层
|
||||||
|
@ -11,17 +11,16 @@ import com.muyu.enterprise.domain.FaultType;
|
||||||
* @Date 2024/10/3 15:22
|
* @Date 2024/10/3 15:22
|
||||||
* @author MingWei.Zong
|
* @author MingWei.Zong
|
||||||
*/
|
*/
|
||||||
|
public class CarFaultCacheService extends CacheAbsBasic<String, FaultRule> {
|
||||||
public class CarFaultCacheService extends CacheAbsBasic<String, FaultType> {
|
|
||||||
@Override
|
@Override
|
||||||
public String keyPre() {
|
public String keyPre() {
|
||||||
return "faultType:info:";
|
return "faultRule:info:";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String decode(String key) {
|
public String decode(String key) {
|
||||||
return key.replace("faultType:info:","");
|
return key.replace("faultRule:info:","");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ package com.muyu.enterprise.controller;
|
||||||
|
|
||||||
|
|
||||||
import com.muyu.common.core.domain.Result;
|
import com.muyu.common.core.domain.Result;
|
||||||
import com.muyu.enterprise.domain.FaultrRule;
|
import com.muyu.enterprise.domain.FaultRule;
|
||||||
import com.muyu.enterprise.service.FaultrRuleService;
|
import com.muyu.enterprise.service.FaultrRuleService;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -26,9 +26,9 @@ public class FaultrRuleController {
|
||||||
* 查询车辆故障列表
|
* 查询车辆故障列表
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/faultRuleList", method = RequestMethod.GET)
|
@RequestMapping(value = "/faultRuleList", method = RequestMethod.GET)
|
||||||
public Result<List<FaultrRule>> faultRuleList(FaultrRule faultrRule)
|
public Result<List<FaultRule>> faultRuleList(FaultRule faultrRule)
|
||||||
{
|
{
|
||||||
List<FaultrRule> list = faultrRuleService.faultRuleList(faultrRule);
|
List<FaultRule> list = faultrRuleService.faultRuleList(faultrRule);
|
||||||
return Result.success(list);
|
return Result.success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ public class FaultrRuleController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/insertRule",method = RequestMethod.POST)
|
@RequestMapping(value = "/insertRule",method = RequestMethod.POST)
|
||||||
public Result insertRule(@RequestBody FaultrRule faultrRule){
|
public Result insertRule(@RequestBody FaultRule faultrRule){
|
||||||
return Result.success(faultrRuleService.save(faultrRule));
|
return Result.success(faultrRuleService.save(faultrRule));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ public class FaultrRuleController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/updateRule",method = RequestMethod.POST)
|
@RequestMapping(value = "/updateRule",method = RequestMethod.POST)
|
||||||
public Result updateRule(@RequestBody FaultrRule faultrRule){
|
public Result updateRule(@RequestBody FaultRule faultrRule){
|
||||||
return Result.success(faultrRuleService.updateById(faultrRule));
|
return Result.success(faultrRuleService.updateById(faultrRule));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ public class FaultrRuleController {
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET)
|
@RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET)
|
||||||
public Result byidRuleId(@PathVariable Long faultRuleId){
|
public Result byidRuleId(@PathVariable Long faultRuleId){
|
||||||
FaultrRule byid = faultrRuleService.byidRuleId(faultRuleId);
|
FaultRule byid = faultrRuleService.byidRuleId(faultRuleId);
|
||||||
return Result.success(byid);
|
return Result.success(byid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.muyu.enterprise.mapper;
|
package com.muyu.enterprise.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.muyu.enterprise.domain.FaultrRule;
|
import com.muyu.enterprise.domain.FaultRule;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
|
||||||
* @Description FaultrRuleMapper:故障规则持久层
|
* @Description FaultrRuleMapper:故障规则持久层
|
||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface FaultrRuleMapper extends BaseMapper<FaultrRule> {
|
public interface FaultrRuleMapper extends BaseMapper<FaultRule> {
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.muyu.enterprise.service;
|
package com.muyu.enterprise.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.muyu.enterprise.domain.FaultrRule;
|
import com.muyu.enterprise.domain.FaultRule;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
/**
|
/**
|
||||||
|
@ -10,8 +10,8 @@ import java.util.List;
|
||||||
* @Date 2024/9/28 12.19
|
* @Date 2024/9/28 12.19
|
||||||
* @Description FaultrRuleService:故障规则业务层
|
* @Description FaultrRuleService:故障规则业务层
|
||||||
*/
|
*/
|
||||||
public interface FaultrRuleService extends IService<FaultrRule> {
|
public interface FaultrRuleService extends IService<FaultRule> {
|
||||||
List<FaultrRule> faultRuleList(FaultrRule faultrRule);
|
List<FaultRule> faultRuleList(FaultRule faultrRule);
|
||||||
|
|
||||||
FaultrRule byidRuleId(Long faultRuleId);
|
FaultRule byidRuleId(Long faultRuleId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.muyu.enterprise.service.impl;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.muyu.common.core.utils.StringUtils;
|
import com.muyu.common.core.utils.StringUtils;
|
||||||
import com.muyu.enterprise.domain.FaultrRule;
|
import com.muyu.enterprise.domain.FaultRule;
|
||||||
import com.muyu.enterprise.mapper.FaultrRuleMapper;
|
import com.muyu.enterprise.mapper.FaultrRuleMapper;
|
||||||
import com.muyu.enterprise.service.FaultrRuleService;
|
import com.muyu.enterprise.service.FaultrRuleService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -17,25 +17,25 @@ import java.util.List;
|
||||||
* @Description FaultrRuleServiceImpl:故障规则业务实现层
|
* @Description FaultrRuleServiceImpl:故障规则业务实现层
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class FaultrRuleServiceImpl extends ServiceImpl<FaultrRuleMapper, FaultrRule> implements FaultrRuleService {
|
public class FaultrRuleServiceImpl extends ServiceImpl<FaultrRuleMapper, FaultRule> implements FaultrRuleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<FaultrRule> faultRuleList(FaultrRule faultrRule) {
|
public List<FaultRule> faultRuleList(FaultRule faultrRule) {
|
||||||
LambdaQueryWrapper<FaultrRule> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<FaultRule> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) {
|
if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) {
|
||||||
queryWrapper.eq(FaultrRule::getFaultRuleName,faultrRule.getFaultRuleName());
|
queryWrapper.eq(FaultRule::getFaultRuleName,faultrRule.getFaultRuleName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) {
|
if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) {
|
||||||
queryWrapper.eq(FaultrRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter());
|
queryWrapper.eq(FaultRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter());
|
||||||
}
|
}
|
||||||
return this.list(queryWrapper);
|
return this.list(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public FaultrRule byidRuleId(Long faultRuleId) {
|
public FaultRule byidRuleId(Long faultRuleId) {
|
||||||
LambdaQueryWrapper<FaultrRule> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<FaultRule> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
Assert.notNull(faultRuleId, "规则ID不可为空");
|
Assert.notNull(faultRuleId, "规则ID不可为空");
|
||||||
queryWrapper.eq(FaultrRule::getFaultRuleId, faultRuleId);
|
queryWrapper.eq(FaultRule::getFaultRuleId, faultRuleId);
|
||||||
return this.getOne(queryWrapper);
|
return this.getOne(queryWrapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue