diff --git a/february-fault-common/src/main/java/com/february/fault/domain/Fault.java b/february-fault-common/src/main/java/com/february/fault/domain/Fault.java index 310a7f8..144f43d 100644 --- a/february-fault-common/src/main/java/com/february/fault/domain/Fault.java +++ b/february-fault-common/src/main/java/com/february/fault/domain/Fault.java @@ -1,6 +1,10 @@ package com.february.fault.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * @program: february-fault-information @@ -13,6 +17,10 @@ import lombok.Data; * 故障信息表 */ @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "t_fault") public class Fault { /** * 主键id diff --git a/february-fault-common/src/main/java/com/february/fault/domain/req/FaultAddReq.java b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultAddReq.java new file mode 100644 index 0000000..2f059bf --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultAddReq.java @@ -0,0 +1,62 @@ +package com.february.fault.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * @program: february-fault-information + * @description: 故障信息添加表 + * @author: Mr.Wang + * @create: 2023-11-20 20:00 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FaultAddReq { + /** + * 故障码 + */ + @NotEmpty(message = "故障码不能为空") + private String faultBh; + /** + * 故障名称 + */ + private String faultName; + /** + * 故障类型id + */ + private Integer faultTypeId; + /** + * 车辆id + */ + private Integer carId; + /** + * 驱动机id + */ + private Integer actuateId; + /** + * 故障描述 + */ + private String faultDetail; + /** + * 故障级别id + */ + private Integer faultRankId; + /** + * 是否产生告警 + */ + private Integer isAlarm; + /** + * 响应方式 + */ + private Integer respondStyle; + /** + * 创建工单 + */ + private Integer isCreate; +} diff --git a/february-fault-server/pom.xml b/february-fault-server/pom.xml index 072d9f4..7ef553d 100644 --- a/february-fault-server/pom.xml +++ b/february-fault-server/pom.xml @@ -20,8 +20,15 @@ - - + + com.github.yulichang + mybatis-plus-join + 1.2.4 + + + com.february + february-common-core + com.february february-fault-remote @@ -40,6 +47,7 @@ february-common-datasource 3.6.3 + com.february february-fault-common diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java index b0fa758..4c20881 100644 --- a/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java @@ -3,6 +3,8 @@ package com.february.fault.controller; import com.february.common.redis.service.RedisService; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; + + import com.february.fault.result.Result; import com.february.fault.service.FaultService; import org.springframework.beans.factory.annotation.Autowired; 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 1f88df1..c69bc0d 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 @@ -1,7 +1,9 @@ package com.february.fault.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; +import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,18 +16,14 @@ import java.util.List; * @create: 2023-11-19 16:24 **/ @Mapper -public interface FaultMapper { - List faultList(); - - Fault findFault(@Param("faultId") Integer faultId); - +public interface FaultMapper extends MPJBaseMapper,BaseMapper { Integer addFault(Fault fault); Integer addFaultAlarm(FaultAlarm faultAlarm); List faultAlarmList(); - Integer delFault(@Param("faultId") Integer faultId); +// Integer delFault(@Param("faultId") Integer faultId); Integer delFaultAlarm(@Param("faultAlarmId") Integer faultAlarmId); 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 c4284c1..12b5a03 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 @@ -1,10 +1,14 @@ package com.february.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; import com.february.fault.mapper.FaultMapper; import com.february.fault.result.Result; import com.february.fault.service.FaultService; +import com.github.yulichang.base.MPJBaseMapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,14 +26,25 @@ public class FaultServiceImpl implements FaultService { private FaultMapper faultMapper; @Override public Result> faultList() { - List list=faultMapper.faultList(); + MPJLambdaWrapper faultMPJLambdaWrapper = new MPJLambdaWrapper<>(); + MPJLambdaWrapper faultMPJLambdaWrapper1 = faultMPJLambdaWrapper.selectAll(Fault.class); + List list = faultMapper.selectJoinList(Fault.class, faultMPJLambdaWrapper1); return Result.success(list); +// BaseMapper faultBaseMapper = new BaseMapper<>(); } @Override public Result findFault(Integer faultId) { - Fault fault=faultMapper.findFault(faultId); +// MPJLambdaWrapper faultMPJLambdaWrapper = new MPJLambdaWrapper<>(); +// faultMPJLambdaWrapper.select +// Fault fault = faultMapper.selectById(faultId); +// QueryWrapper faultQueryWrapper = new QueryWrapper<>(); + QueryWrapper faultQueryWrapper = new QueryWrapper<>(); + faultQueryWrapper.eq("fault_id",faultId); + Fault fault = faultMapper.selectOne(faultQueryWrapper); return Result.success(fault); + + } @Override @@ -58,11 +73,11 @@ public class FaultServiceImpl implements FaultService { @Override public Result delFault(Integer faultId) { - Integer i=faultMapper.delFault(faultId); - if(i>0){ - return Result.success("删除成功"); + boolean b = faultMapper.deleteById(faultId) > 0; + if(!b){ + return Result.error("删除失败"); } - return Result.error("删除失败"); + return Result.success("删除成功"); } @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 f80191a..57c9b0e 100644 --- a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml +++ b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml @@ -9,18 +9,18 @@ INSERT INTO `car`.`t_fault_alarm` ( `car_bh`, `car_vin`, `fault_alarm_type`, `fault_name`, `fault_bh`, `response_level`, `alarm_state`, `hand_style`, `alarm_start_time`, `alarm_near_time`, `alarm_end_time`, `admin_id`, `fault_processor`, `process_time`, `fault_alarm_state`) VALUES ( #{carBh}, #{carVin}, #{faultAlarmType}, #{faultName}, #{faultBh}, #{responseLevel}, #{alarmState}, #{handStyle}, #{alarmStartTime}, #{alarmNearTime}, #{alarmEndTime}, #{adminId}, #{faultProcessor}, #{processTime}, #{faultAlarmState}) - - delete from t_fault where fault_id=#{faultId} - + + + delete from t_fault_alarm where fault_alarm_id=#{faultAlarmId} - + + + diff --git a/pom.xml b/pom.xml index 38d71ee..6954714 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,21 @@ february-fault-information故障信息 + + + + mysql + mysql-connector-java + 8.0.19 + + + + com.baomidou + mybatis-plus-boot-starter + 3.5.2 + +