diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 25a3957..ed76427 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -42,6 +42,11 @@ public class SysCarFault extends BaseEntity { */ @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") private Integer faultTypeId; + /** + * 车辆故障规则ID + */ + @Schema(defaultValue = "车辆故障规则ID",type = "Integer",description = "车辆故障规则ID") + public Integer faultRuleId; /** * 故障VIN编码 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java new file mode 100644 index 0000000..39577c9 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/FaultResp.java @@ -0,0 +1,96 @@ +package com.muyu.enterprise.domain.resp; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.enterprise.domain.SysCarFault; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.function.Supplier; + +/** + * 故障返回 + * @author chenruijia + * @Date 2024/9/28 21:11 + * @Description FaultResp:故障返回 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "故障返回") +public class FaultResp { + /** + * 车辆故障码 + */ + @Schema(defaultValue = "车辆故障码",type = "String",description = "车辆故障码") + private String faultCode; + /** + * 车辆故障那类型ID + */ + @Schema(defaultValue = "车辆故障那类型ID",type = "Integer",description = "车辆故障类型ID") + private Integer faultTypeId; + /** + * 车辆故障规则ID + */ + @Schema(defaultValue = "车辆故障规则ID",type = "Integer",description = "车辆故障规则ID") + public Integer faultRuleId; + /** + * 故障VIN编码 + */ + @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") + public String carVin; + /** + * 车辆故障标签 + */ + @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") + public String faultLabel; + /** + * 车辆故障位 + */ + @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") + public String faultBit; + /** + * 车辆故障值 + */ + @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") + public String faultValue; + /** + * v + */ + @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") + public String faultWarn; + /** + * 报警状态 + */ + @Schema(defaultValue = "报警状态",type = "String",description = "报警状态") + public String warnStatus; + /** + * 故障描述信息 + */ + @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") + public String faultDesc; + /** + * 启用状态 + */ + @Schema(defaultValue = "启用状态",type = "Integer",description = "启用状态") + public Integer state; + /** + * 故障规则名称 + */ + @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") + private String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + private String faultRuleParameter; + /** + * 故障规则描述 + */ + @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") + private String faultRuleDescription; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index d2bf065..700eb21 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -40,7 +40,7 @@ public class SysCarFaultController extends BaseController * 查询车辆故障列表 */ @RequestMapping(value = "/list", method = RequestMethod.GET) - public Result> list(SysCarFault sysCarFault) + public Result> list(@RequestBody SysCarFault sysCarFault) { List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); return success(list); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java index c1cc3ea..8d570a6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java @@ -1,6 +1,7 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.enterprise.domain.SysCarFault; import org.apache.ibatis.annotations.Mapper; @@ -12,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper; * @Description SysCarFaultMapper:故障管理持久层 */ @Mapper -public interface SysCarFaultMapper extends BaseMapper{ +public interface SysCarFaultMapper extends MPJBaseMapper { } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index 20b59ca..276c3ca 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -113,4 +113,6 @@ public class SysEntController extends BaseController { sysEntService.removeById(entId); return Result.success(null,Constants.SUCCESS_MESSAGE); } + +// @RequestMapping(value = "findId",) }