From 38bd0be5aa56018480a0fbc16e18368475d878dc Mon Sep 17 00:00:00 2001 From: Wtd <1658714322@qq.com> Date: Wed, 22 Nov 2023 20:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=85=E9=9A=9C=E7=A0=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fault/controller/FaultCodeController.java | 5 ++- .../fault/controller/FaultLogController.java | 22 +++++++++++-- .../fault/service/FaultCodeService.java | 2 ++ .../fault/service/FaultLogService.java | 2 ++ .../service/impl/FaultCodeServiceImpl.java | 22 +++++++++++++ .../service/impl/FaultLogServiceImpl.java | 33 ++++++++++++++++++- 6 files changed, 82 insertions(+), 4 deletions(-) diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java index 64bb389..91116e3 100644 --- a/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultCodeController.java @@ -53,5 +53,8 @@ public class FaultCodeController { Result result=faultCodeService.addFaultCode(faultCode); return result; } - + @PostMapping("/update") + public Result updateFaultCode(@RequestBody FaultCode faultCode){ + return faultCodeService.updateFaultCode(faultCode); + } } diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultLogController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultLogController.java index e1a985f..6378956 100644 --- a/february-fault-server/src/main/java/com/february/fault/controller/FaultLogController.java +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultLogController.java @@ -9,6 +9,7 @@ package com.february.fault.controller; import com.february.common.core.domain.R; import com.february.common.core.domain.Result; +import com.february.fault.aspect.WebLog; import com.february.fault.domain.FaultCode; import com.february.fault.domain.FaultLog; import com.february.fault.service.FaultLogService; @@ -33,11 +34,28 @@ public class FaultLogController { private FaultLogService faultLogService; @Autowired private HttpServletRequest request; + + /** + * 故障日志列表 + * @param faultLog + * @return + */ @PostMapping("/list") + @WebLog(description = "故障日志列表") public Result> faultLogList(@RequestBody FaultLog faultLog){ - log.info("功能名称：故障日志列表，请求路径：{}，请求方式：{}",request.getRequestURI(),request.getMethod()); Result> result=faultLogService.faultLogList(faultLog); - log.info("响应结果：{}",result); return result; } + + /** + * 新增故障日志 + * @param faultLog + * @return + */ + @PostMapping("/add") + @WebLog(description = "新增故障日志") + public Result addFaultLog(@RequestBody FaultLog faultLog){ + return faultLogService.addFaultLog(faultLog); + } + } diff --git a/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java b/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java index 010b59c..2fa4971 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java +++ b/february-fault-server/src/main/java/com/february/fault/service/FaultCodeService.java @@ -18,4 +18,6 @@ public interface FaultCodeService extends IService { Result addFaultCode(FaultCode faultCode); + + Result updateFaultCode(FaultCode faultCode); } diff --git a/february-fault-server/src/main/java/com/february/fault/service/FaultLogService.java b/february-fault-server/src/main/java/com/february/fault/service/FaultLogService.java index eed6930..72368ed 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/FaultLogService.java +++ b/february-fault-server/src/main/java/com/february/fault/service/FaultLogService.java @@ -14,4 +14,6 @@ import java.util.List; **/ public interface FaultLogService extends IService { Result> faultLogList(FaultLog faultLog); + + Result addFaultLog(FaultLog faultLog); } diff --git a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java index b47da48..2c68b56 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java +++ b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultCodeServiceImpl.java @@ -49,6 +49,11 @@ public class FaultCodeServiceImpl extends ServiceImpl addFaultCode(FaultCode faultCode) { int insert = faultCodeMapper.insert(faultCode); @@ -58,5 +63,22 @@ public class FaultCodeServiceImpl extends ServiceImpl faultCodeQueryWrapper = new QueryWrapper<>(); + faultCodeQueryWrapper.eq("fault_code_id", faultCode.getFaultCodeId()); + int update = faultCodeMapper.update(faultCode, faultCodeQueryWrapper); + FaultCode faultCode1 = faultCodeMapper.selectOne(faultCodeQueryWrapper); + if(update>0){ + return Result.success(faultCode1,"修改成功"); + } + return Result.error(faultCode1,"修改失败"); + } + } diff --git a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultLogServiceImpl.java b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultLogServiceImpl.java index d312756..43de0a9 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultLogServiceImpl.java +++ b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultLogServiceImpl.java @@ -1,13 +1,19 @@ package com.february.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.february.common.core.domain.Result; import com.february.fault.domain.FaultLog; import com.february.fault.mapper.FaultLogMapper; import com.february.fault.service.FaultLogService; +import com.february.fault.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; +import java.util.Objects; /** * @program: february-fault-information @@ -17,9 +23,34 @@ import java.util.List; **/ @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { + @Autowired + private FaultLogMapper faultLogMapper; @Override public Result> faultLogList(FaultLog faultLog) { + QueryWrapper faultLogQueryWrapper = new QueryWrapper<>(); + if(!Objects.equals(faultLog.getFaultBh(), "") && faultLog.getFaultBh()!=null){ + faultLogQueryWrapper.eq("fault_bh",faultLog.getFaultBh()); + } + if(!Objects.equals(faultLog.getCarVin(), "") && faultLog.getCarVin()!=null){ + faultLogQueryWrapper.eq("car_vin",faultLog.getCarVin()); + } + if(!StringUtils.isNull(faultLog.getFaultStartTime())){ + faultLogQueryWrapper.ge("fault_start_time",faultLog.getFaultStartTime()); + } + if(!StringUtils.isNull(faultLog.getFaultEndTime())){ + faultLogQueryWrapper.le("fault_end_time",faultLog.getFaultEndTime()); + } + Page faultLogPage = new Page<>(1,2); + List records = faultLogMapper.selectPage(faultLogPage, faultLogQueryWrapper).getRecords(); + return Result.success(records,"故障日志列表"); + } - return null; + @Override + public Result addFaultLog(FaultLog faultLog) { + int insert = faultLogMapper.insert(faultLog); + if(insert>0){ + return Result.success("添加成功"); + } + return Result.error("添加失败"); } }