实体类重新建设

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;
+}

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;
+}

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;
 }

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;
+
+}

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 {
+
+}

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<Fault>,BaseMapper<Fault> {
-//    Integer addFault(Fault fault);
-
     Integer addFaultAlarm(FaultAlarm faultAlarm);
 
     List<FaultAlarm> faultAlarmList();
 
-//    Integer delFault(@Param("faultId") Integer faultId);
 
     Integer delFaultAlarm(@Param("faultAlarmId") Integer faultAlarmId);
 
-    Fault findFaultByBh(@Param("faultBh") String faultBh);
 
     List<FaultRank> faultRankList();
 

february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java

@@ -97,8 +97,14 @@ public class FaultServiceImpl extends ServiceImpl<FaultMapper,Fault> implements
 
     @Override
     public Result<Fault> findFaultByBh(String faultBh) {
-        Fault fault=faultMapper.findFaultByBh(faultBh);
-        return Result.success(fault);
+        QueryWrapper<Fault> 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

february-fault-server/src/main/resources/mapper/february/FaultMapper.xml

@@ -32,9 +32,9 @@
     <select id="faultAlarmList" resultType="com.february.fault.domain.FaultAlarm">
         select * from t_fault_alarm
     </select>
-    <select id="findFaultByBh" resultType="com.february.fault.domain.Fault">
-        select * from t_fault where fault_bh=#{faultBh}
-    </select>
+<!--    <select id="findFaultByBh" resultType="com.february.fault.domain.Fault">-->
+<!--        select * from t_fault where fault_bh=#{faultBh}-->
+<!--    </select>-->
     <select id="faultRankList" resultType="com.february.fault.domain.FaultRank">
         select * from t_fault_rank
     </select>