diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java index 0052f50..0b5cd43 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java @@ -3,7 +3,7 @@ package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; import com.muyu.enterprise.domain.FaultRule; -import com.muyu.enterprise.service.FaultrRuleService; +import com.muyu.enterprise.service.FaultRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,15 +20,17 @@ import java.util.List; @RequestMapping("/rule") @Tag(name = "故障的规则",description = "对故障数据规则的判断") public class FaultRuleController { + @Autowired - private FaultRuleService FaultRuleService; + private FaultRuleService faultRuleList; + /** * 查询车辆故障列表 */ @RequestMapping(value = "/faultRuleList", method = RequestMethod.GET) public Result> faultRuleList(FaultRule faultRule) { - List list = FaultRuleService.faultRuleList(faultRule); + List list = faultRuleList.faultRuleList(faultRule); return Result.success(list); } @@ -39,7 +41,7 @@ public class FaultRuleController { */ @RequestMapping(value = "/insertRule",method = RequestMethod.POST) public Result insertRule(@RequestBody FaultRule faultRule){ - return Result.success(FaultRuleService.save(faultRule)); + return Result.success(faultRuleList.save(faultRule)); } /** @@ -49,7 +51,7 @@ public class FaultRuleController { */ @RequestMapping(value = "/updateRule",method = RequestMethod.POST) public Result updateRule(@RequestBody FaultRule faultRule){ - return Result.success(FaultRuleService.updateById(faultRule)); + return Result.success(faultRuleList.updateById(faultRule)); } /** @@ -59,7 +61,7 @@ public class FaultRuleController { */ @RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET) public Result byidRuleId(@PathVariable Long faultRuleId){ - FaultRule byid = FaultRuleService.byidRuleId(faultRuleId); + FaultRule byid = faultRuleList.byidRuleId(faultRuleId); return Result.success(byid); } @@ -69,7 +71,7 @@ public class FaultRuleController { @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) public Result remove(@PathVariable("ids") Long[] ids) { - FaultRuleService.removeBatchByIds(Arrays.asList(ids)); + faultRuleList.removeBatchByIds(Arrays.asList(ids)); return Result.success(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java index b4e243f..4764c1f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java @@ -8,10 +8,10 @@ import java.util.List; * 故障规则业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 - * @Description FaultRuleService:故障规则业务层 + * @Description FaultrRuleService:故障规则业务层 */ public interface FaultRuleService extends IService { - List faultRuleList(FaultRule faultRule); + List faultRuleList(FaultRule faultrRule); FaultRule byidRuleId(Long faultRuleId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java deleted file mode 100644 index 9036915..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.enterprise.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.FaultRule; - -import java.util.List; -/** - * 故障规则业务层 - * @Author: chenruijia - * @Date 2024/9/28 12.19 - * @Description FaultrRuleService:故障规则业务层 - */ -public interface FaultrRuleService extends IService { - List faultRuleList(FaultRule faultrRule); - - FaultRule byidRuleId(Long faultRuleId); -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java index 77e17bd..6b04cc2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java @@ -14,19 +14,19 @@ import java.util.List; * 故障规则业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 - * @Description FaultRuleServiceImpl:故障规则业务实现层 + * @Description FaultrRuleServiceImpl:故障规则业务实现层 */ @Service public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { @Override - public List faultRuleList(FaultRule faultRule) { + public List faultRuleList(FaultRule faultrRule) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultRule.getFaultRuleName())) { - queryWrapper.eq(FaultRule::getFaultRuleName,faultRule.getFaultRuleName()); + if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) { + queryWrapper.eq(FaultRule::getFaultRuleName,faultrRule.getFaultRuleName()); } - if (StringUtils.isNotEmpty(faultRule.getFaultRuleParameter())) { - queryWrapper.eq(FaultRule::getFaultRuleParameter,faultRule.getFaultRuleParameter()); + if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) { + queryWrapper.eq(FaultRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter()); } return this.list(queryWrapper); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java deleted file mode 100644 index 25ddbdd..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.enterprise.domain.FaultRule; -import com.muyu.enterprise.mapper.FaultrRuleMapper; -import com.muyu.enterprise.service.FaultrRuleService; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; -/** - * 故障规则业务实现层 - * @Author: chenruijia - * @Date 2024/9/28 12.19 - * @Description FaultrRuleServiceImpl:故障规则业务实现层 - */ -@Service -public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService { - - @Override - public List faultRuleList(FaultRule faultrRule) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) { - queryWrapper.eq(FaultRule::getFaultRuleName,faultrRule.getFaultRuleName()); - } - if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) { - queryWrapper.eq(FaultRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter()); - } - return this.list(queryWrapper); - } - - @Override - public FaultRule byidRuleId(Long faultRuleId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(faultRuleId, "规则ID不可为空"); - queryWrapper.eq(FaultRule::getFaultRuleId, faultRuleId); - return this.getOne(queryWrapper); - } -}