diff --git a/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java b/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java new file mode 100644 index 0000000..afa1616 --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/domain/FaultCode.java @@ -0,0 +1,68 @@ +package com.february.fault.domain; + +/** + * @program: february-fault-information + * @description: 故障码信息 + * @author: Mr.Wang + * @create: 2023-11-21 14:10 + **/ + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 车辆故障码 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "t_fault_code") +public class FaultCode { + /** + * 主键ID + */ + @NotNull(message = "主键不能为空") + private Integer faultCodeId; + /** + * 故障码 + */ + @NotEmpty(message = "故障码不能为空") + private String faultBh; + /** + * 故障类型id + */ + @NotNull(message = "故障类型id不能为空") + private Integer faultTypeId; + /** + * 故障组 + */ + @NotEmpty(message = "故障组不能为空") + private String faultGroup; + /** + * 故障位 + */ + @NotEmpty(message = "故障位不能为空") + private String faultSeat; + /** + * 故障值 + */ + @NotEmpty(message = "故障值不能为空") + private String faultValue; + /** + * 故障标签 + */ + @NotEmpty(message = "故障标签不能为空") + private String faultTag; + /** + * 是否警告 + */ + @NotNull(message = "警告值不能为空") + private Integer isWarn; +} diff --git a/february-fault-common/src/main/java/com/february/fault/domain/FaultLog.java b/february-fault-common/src/main/java/com/february/fault/domain/FaultLog.java new file mode 100644 index 0000000..b7fd8d3 --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/domain/FaultLog.java @@ -0,0 +1,58 @@ +package com.february.fault.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @program: february-fault-information + * @description: 故障日志 + * @author: Mr.Wang + * @create: 2023-11-21 14:31 + **/ + +/** + * 故障日志表 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "t_fault_log") +public class FaultLog { + /** + * 故障日志id + */ + @NotNull(message = "主键不能为空") + private Integer faultLogId; + /** + * 故障码 + */ + @NotEmpty(message = "故障码不能为空") + private String faultBh; + /** + * 车辆VIN + */ + @NotEmpty(message = "车辆VIN不能为空") + private String carVin; + /** + * 开始报警时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date faultStartTime; + /** + * 结束报警时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date faultEndTime; +} diff --git a/february-fault-common/src/main/java/com/february/fault/domain/FaultType.java b/february-fault-common/src/main/java/com/february/fault/domain/FaultType.java index d9c496b..d3f8a10 100644 --- a/february-fault-common/src/main/java/com/february/fault/domain/FaultType.java +++ b/february-fault-common/src/main/java/com/february/fault/domain/FaultType.java @@ -8,19 +8,32 @@ package com.february.fault.domain; **/ +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * 故障类型表 */ @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "t_fault_type") public class FaultType { /** * 故障类型id */ + @NotNull(message = "主键不能为空") private Integer faultTypeId; /** * 故障类型名称 */ + @NotEmpty(message = "故障类型名称不能为空") private String faultTypeName; } diff --git a/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java b/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java new file mode 100644 index 0000000..52a8b70 --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/page/PageQuery.java @@ -0,0 +1,38 @@ +package com.february.fault.page;/** + * @program: february-fault-information + * @description: + * @author: Mr.Wang + * @create: 2023-11-21 09:36 + **/ + +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.data.domain.Page; + +/** + * @description: + * @author: Mr.Wang + * @create: 2023-11-21 09:36 + **/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class PageQuery { + /** + * 第几页 + */ + private Integer page; + /** + * 每页长度 + */ + private Integer pageSize; + /** + * 排序方式 + */ + private String orderBy; + +} diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultAlarmController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultAlarmController.java new file mode 100644 index 0000000..a5a7cea --- /dev/null +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultAlarmController.java @@ -0,0 +1,27 @@ +package com.february.fault.controller;/** + * @program: february-fault-information + * @description: 故障警告 + * @author: Mr.Wang + * @create: 2023-11-21 09:28 + **/ + +/** + * @description: 故障警告 + * @author: Mr.Wang + * @create: 2023-11-21 09:28 + **/ + +import com.february.common.core.domain.Result; +import com.february.fault.domain.FaultAlarm; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 故障警告 + */ +@RestController +public class FaultAlarmController { + +} diff --git a/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java b/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java index 632e183..325bf40 100644 --- a/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java +++ b/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java @@ -19,17 +19,13 @@ import java.util.List; **/ @Mapper public interface FaultMapper extends MPJBaseMapper,BaseMapper { -// Integer addFault(Fault fault); - Integer addFaultAlarm(FaultAlarm faultAlarm); List faultAlarmList(); -// Integer delFault(@Param("faultId") Integer faultId); Integer delFaultAlarm(@Param("faultAlarmId") Integer faultAlarmId); - Fault findFaultByBh(@Param("faultBh") String faultBh); List faultRankList(); diff --git a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java index 4155591..5635915 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java +++ b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java @@ -97,8 +97,14 @@ public class FaultServiceImpl extends ServiceImpl implements @Override public Result findFaultByBh(String faultBh) { - Fault fault=faultMapper.findFaultByBh(faultBh); - return Result.success(fault); + QueryWrapper faultQueryWrapper = new QueryWrapper<>(); + faultQueryWrapper.eq("fault_bh",faultBh); + Fault fault = faultMapper.selectOne(faultQueryWrapper); + if(fault!=null){ + return Result.success(fault); + }else { + return Result.error("未找到故障"); + } } @Override diff --git a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml index c272c08..825aab6 100644 --- a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml +++ b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml @@ -32,9 +32,9 @@ - + + +