diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java index 0c313ea..301b292 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java @@ -29,10 +29,10 @@ public class SysCarFault extends BaseEntity { @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") private String faultCode; /** - * 车辆故障类型 + * 车辆故障类型ID */ - @Schema(defaultValue = "车辆故障类型",type = "String",description = "车辆故障类型") - private String faultType; + @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") + private Integer faultTypeId; /** * 故障VIN编码 */ diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java index 0f8fcb7..7d4ee75 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -6,9 +6,9 @@ import com.muyu.fault.common.FaultType; import com.muyu.fault.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/type") @@ -22,8 +22,41 @@ public class FaultTypeController { * @return */ @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) - public Result faultTypeList(){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return Result.success(faultTypeService.list(queryWrapper)); + public Result> faultTypeList(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.faultTypeList(faultType)); } + + + /** + * 添加故障类型 + * @param faultType + * @return + */ + @RequestMapping(value = "insertType",method = RequestMethod.POST) + public Result insertType(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.save(faultType)); + } + + + /** + * 修改故障类型 + * @param faultType + * @return + */ + @RequestMapping(value = "updateType",method = RequestMethod.POST) + public Result updtaeType(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.updateById(faultType)); + } + + + /** + * 删除故障类型 + * @param faultTypeId + * @return + */ + @RequestMapping(value = "deleteType/{faultTypeId}",method = RequestMethod.DELETE) + public Result deleteType(@PathVariable(name = "faultTypeId") Long faultTypeId){ + return Result.success(faultTypeService.removeById(faultTypeId)); + } + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java index 5b8d7b9..e4e6037 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java @@ -3,5 +3,8 @@ package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultType; +import java.util.List; + public interface FaultTypeService extends IService { + List faultTypeList(FaultType faultType); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java index 3c871c4..d316e3c 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java @@ -1,11 +1,26 @@ package com.muyu.fault.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.fault.common.FaultType; import com.muyu.fault.mapper.FaultTypeMapper; import com.muyu.fault.service.FaultTypeService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { + @Override + public List faultTypeList(FaultType faultType) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultType.getFaultTypeName())) { + queryWrapper.like(FaultType::getFaultTypeName,faultType.getFaultTypeName()); + } + if (StringUtils.isNotEmpty(faultType.getFaultTypeDescription())) { + queryWrapper.like(FaultType::getFaultTypeDescription,faultType.getFaultTypeDescription()); + } + return this.list(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java index c229932..a3ba13f 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java @@ -42,12 +42,10 @@ public class SysCarFaultServiceImpl public List selectSysCarFaultList(SysCarFault sysCarFault) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getFaultType()), - SysCarFault::getFaultType, sysCarFault.getFaultType()); + queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(sysCarFault.getFaultTypeId())), + SysCarFault::getFaultTypeId, sysCarFault.getFaultTypeId()); queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getState()), SysCarFault::getState, sysCarFault.getState()); - queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultType()), - SysCarFault::getFaultType, sysCarFault.getFaultType()); queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getCarVin()), SysCarFault::getCarVin, sysCarFault.getCarVin()); queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultWarn()),