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 144f43d..33bd867 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,7 @@ package com.february.fault.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.february.fault.domain.req.FaultAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -66,4 +67,18 @@ public class Fault { * 创建工单 */ private Integer isCreate; + public static Fault addFaultReqBuild(FaultAddReq faultAddReq){ + return Fault.builder() + .faultBh(faultAddReq.getFaultBh()) + .faultDetail(faultAddReq.getFaultDetail()) + .actuateId(faultAddReq.getActuateId()) + .carId(faultAddReq.getCarId()) + .faultName(faultAddReq.getFaultName()) + .faultRankId(faultAddReq.getFaultRankId()) + .faultTypeId(faultAddReq.getFaultTypeId()) + .isAlarm(faultAddReq.getIsAlarm()) + .isCreate(faultAddReq.getIsCreate()) + .respondStyle(faultAddReq.getRespondStyle()) + .build(); + } } 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 index 2f059bf..7fc9755 100644 --- 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 @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * @program: february-fault-information @@ -26,37 +27,46 @@ public class FaultAddReq { /** * 故障名称 */ + @NotEmpty(message = "故障名称不能为空") private String faultName; /** * 故障类型id */ + @NotNull(message = "故障id不能为空") private Integer faultTypeId; /** * 车辆id */ + @NotNull(message = "车辆id不能为空") private Integer carId; /** * 驱动机id */ + @NotNull(message = "驱动机id不能为空") private Integer actuateId; /** * 故障描述 */ + @NotEmpty(message = "故障描述不能为空") private String faultDetail; /** * 故障级别id */ + @NotNull(message = "故障级别不能为空") private Integer faultRankId; /** * 是否产生告警 */ + @NotNull(message = "告警不为空") private Integer isAlarm; /** * 响应方式 */ + @NotNull(message = "响应方式不为空") private Integer respondStyle; /** * 创建工单 */ + @NotNull(message = "创建工单不为空") private Integer isCreate; } diff --git a/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java new file mode 100644 index 0000000..accafa0 --- /dev/null +++ b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java @@ -0,0 +1,19 @@ +package com.february.fault.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @program: february-fault-information + * @description: + * @author: Mr.Wang + * @create: 2023-11-20 22:17 + **/ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class FaultQueryReq { +} 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 4c20881..777f10f 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 @@ -1,10 +1,13 @@ package com.february.fault.controller; +import com.february.common.core.web.page.TableDataInfo; import com.february.common.redis.service.RedisService; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; +import com.february.fault.domain.FaultRank; +import com.february.fault.domain.FaultType; import com.february.fault.result.Result; import com.february.fault.service.FaultService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,4 +103,52 @@ public class FaultController { public Result delFaultAlarm(@RequestParam Integer faultAlarmId){ return faultService.delFaultAlarm(faultAlarmId); } + + /** + * 故障级别列表 + * @return + */ + @GetMapping("/faultRankList") + public Result> faultRankList(){ + return faultService.faultRankList(); + } + + /** + * 故障类型列表 + * @return + */ + @GetMapping("/faultTypeList") + public Result> faultTypeList(){ + return faultService.faultTypeList(); + } + + /** + * 添加故障级别 + * @param faultRank + * @return + */ + @PostMapping("/addFaultRank") + public Result addFaultRank(@RequestBody FaultRank faultRank){ + return faultService.addFaultRank(faultRank); + } + + /** + * 添加故障类型 + * @param faultType + * @return + */ + @PostMapping("/addFaultType") + public Result addFaultType(@RequestBody FaultType faultType){ + return faultService.addFaultType(faultType); + } + + /** + * 故障信息表 + * @return + */ + @GetMapping("/list") + public Result> selectFaultList(){ + List list=faultService.selectFaultList(); + return Result.success(list); + } } 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 c69bc0d..f7c3404 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 @@ -3,6 +3,8 @@ 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.february.fault.domain.FaultRank; +import com.february.fault.domain.FaultType; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +30,12 @@ public interface FaultMapper extends MPJBaseMapper,BaseMapper { Integer delFaultAlarm(@Param("faultAlarmId") Integer faultAlarmId); Fault findFaultByBh(@Param("faultBh") String faultBh); + + List faultRankList(); + + List faultTypeList(); + + Integer addFaultRank(FaultRank faultRank); + + Integer addFaultType(FaultType faultType); } diff --git a/february-fault-server/src/main/java/com/february/fault/service/FaultService.java b/february-fault-server/src/main/java/com/february/fault/service/FaultService.java index 281ea0b..23d8e69 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/FaultService.java +++ b/february-fault-server/src/main/java/com/february/fault/service/FaultService.java @@ -1,7 +1,10 @@ package com.february.fault.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; +import com.february.fault.domain.FaultRank; +import com.february.fault.domain.FaultType; import com.february.fault.result.Result; import org.springframework.stereotype.Component; @@ -13,8 +16,8 @@ import java.util.List; * @author: Mr.Wang * @create: 2023-11-19 16:24 **/ -@Component -public interface FaultService { + +public interface FaultService extends IService { Result> faultList(); Result findFault(Integer faultId); @@ -30,4 +33,14 @@ public interface FaultService { Result delFaultAlarm(Integer faultAlarmId); Result findFaultByBh(String faultBh); + + Result> faultRankList(); + + Result> faultTypeList(); + + Result addFaultRank(FaultRank faultRank); + + List selectFaultList(); + + Result addFaultType(FaultType faultType); } 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 12b5a03..088330d 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,14 +1,20 @@ package com.february.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; +import com.february.fault.domain.FaultRank; +import com.february.fault.domain.FaultType; import com.february.fault.mapper.FaultMapper; import com.february.fault.result.Result; import com.february.fault.service.FaultService; +import com.february.fault.utils.StringUtils; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,7 +27,7 @@ import java.util.List; * @create: 2023-11-19 16:24 **/ @Service -public class FaultServiceImpl implements FaultService { +public class FaultServiceImpl extends ServiceImpl implements FaultService { @Autowired private FaultMapper faultMapper; @Override @@ -94,4 +100,39 @@ public class FaultServiceImpl implements FaultService { Fault fault=faultMapper.findFaultByBh(faultBh); return Result.success(fault); } + + @Override + public Result> faultRankList() { + List faultRankList=faultMapper.faultRankList(); + return Result.success(faultRankList); + } + + @Override + public Result> faultTypeList() { + List faultTypeList=faultMapper.faultTypeList(); + return Result.success(faultTypeList); + } + + @Override + public Result addFaultRank(FaultRank faultRank) { + Integer i=faultMapper.addFaultRank(faultRank); + if(i>0){ + return Result.success("添加成功"); + } + return Result.error("添加失败"); + } + + @Override + public List selectFaultList() { + return list(); + } + + @Override + public Result addFaultType(FaultType faultType) { + Integer i=faultMapper.addFaultType(faultType); + if(i>0){ + return Result.success("添加成功"); + } + return Result.error("添加失败"); + } } 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 57c9b0e..a3e13eb 100644 --- a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml +++ b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml @@ -9,7 +9,15 @@ 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}) - + + INSERT INTO `car`.`t_fault_rank` ( `fault_rank_name`) + VALUES ( #{faultRankName}) + + + INSERT INTO `car`.`t_fault_type` ( `fault_type_name`) + VALUES ( #{faultTypeName}) + + @@ -27,5 +35,11 @@ + +