diff --git a/.gitignore b/.gitignore index 9405b2d..f3f124a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ logs *.iws *.iml *.ipr +*.yml ### JRebel ### rebel.xml diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java index bb1d9f5..672626c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java @@ -8,12 +8,12 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + /** - * 报文模版表--实体类 - * @ClassName CarTemplate - * @Description 报文模版表 - * @author MingWei.Zong - * @Date 2024/9/28 16:52 + * 故障规则 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultRule:故障规则 */ @Data @NoArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java index d7387d7..6b12fdd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultRule.java @@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder; * 故障规则 * @Author: chenruijia * @Date 2024/9/28 12.23 - * @Description FaultrRule:故障规则 + * @Description FaultRule:故障规则 */ @Data @SuperBuilder diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java similarity index 70% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java index 6cf595c..0052f50 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java @@ -14,42 +14,42 @@ import java.util.List; * 故障的规则控制层 * @author chenruijia * @Date 2024/9/28 11:58 - * @Description FaultrRuleController:故障的规则控制层 + * @Description FaultRuleController:故障的规则控制层 */ @RestController @RequestMapping("/rule") @Tag(name = "故障的规则",description = "对故障数据规则的判断") -public class FaultrRuleController { +public class FaultRuleController { @Autowired - private FaultrRuleService faultrRuleService; + private FaultRuleService FaultRuleService; /** * 查询车辆故障列表 */ @RequestMapping(value = "/faultRuleList", method = RequestMethod.GET) - public Result> faultRuleList(FaultRule faultrRule) + public Result> faultRuleList(FaultRule faultRule) { - List list = faultrRuleService.faultRuleList(faultrRule); + List list = FaultRuleService.faultRuleList(faultRule); return Result.success(list); } /** * 添加车辆规则 - * @param faultrRule + * @param faultRule * @return */ @RequestMapping(value = "/insertRule",method = RequestMethod.POST) - public Result insertRule(@RequestBody FaultRule faultrRule){ - return Result.success(faultrRuleService.save(faultrRule)); + public Result insertRule(@RequestBody FaultRule faultRule){ + return Result.success(FaultRuleService.save(faultRule)); } /** * 修改车辆规则 - * @param faultrRule + * @param faultRule * @return */ @RequestMapping(value = "/updateRule",method = RequestMethod.POST) - public Result updateRule(@RequestBody FaultRule faultrRule){ - return Result.success(faultrRuleService.updateById(faultrRule)); + public Result updateRule(@RequestBody FaultRule faultRule){ + return Result.success(FaultRuleService.updateById(faultRule)); } /** @@ -59,7 +59,7 @@ public class FaultrRuleController { */ @RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET) public Result byidRuleId(@PathVariable Long faultRuleId){ - FaultRule byid = faultrRuleService.byidRuleId(faultRuleId); + FaultRule byid = FaultRuleService.byidRuleId(faultRuleId); return Result.success(byid); } @@ -69,7 +69,7 @@ public class FaultrRuleController { @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) public Result remove(@PathVariable("ids") Long[] ids) { - faultrRuleService.removeBatchByIds(Arrays.asList(ids)); + FaultRuleService.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/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultRuleMapper.java similarity index 69% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultRuleMapper.java index a13b8c7..f1ab5b5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultRuleMapper.java @@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Mapper; * 故障规则持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 - * @Description FaultrRuleMapper:故障规则持久层 + * @Description FaultRuleMapper:故障规则持久层 */ @Mapper -public interface FaultrRuleMapper extends BaseMapper { +public interface FaultRuleMapper extends BaseMapper { } 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 new file mode 100644 index 0000000..b4e243f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java @@ -0,0 +1,17 @@ +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 FaultRuleService:故障规则业务层 + */ +public interface FaultRuleService extends IService { + List faultRuleList(FaultRule faultRule); + + 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 new file mode 100644 index 0000000..77e17bd --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java @@ -0,0 +1,41 @@ +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.FaultRuleMapper; +import com.muyu.enterprise.service.FaultRuleService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; +/** + * 故障规则业务实现层 + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultRuleServiceImpl:故障规则业务实现层 + */ +@Service +public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { + + @Override + public List faultRuleList(FaultRule faultRule) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultRule.getFaultRuleName())) { + queryWrapper.eq(FaultRule::getFaultRuleName,faultRule.getFaultRuleName()); + } + if (StringUtils.isNotEmpty(faultRule.getFaultRuleParameter())) { + queryWrapper.eq(FaultRule::getFaultRuleParameter,faultRule.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); + } +}