From c13bf9528c8a92309c3e63d82d528eb00523c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 20:56:10 +0800 Subject: [PATCH] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sysCarFaultLogController.java | 26 +++++++--- .../muyu/breakdown/domain/SysCarFaultLog.java | 5 +- .../service/SysCarFaultLogService.java | 8 ++- .../impl/sysCarFaultLogServiceImpl.java | 52 +++++++++++++++++-- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java index 9b4a725..2104941 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -23,23 +23,33 @@ public class sysCarFaultLogController extends BaseController { private SysCarFaultLogService service; @GetMapping("/list") - public Result> list(){ + public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.list(); + List list = service.selectSysCarFaultLogList(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listIsReadAlready") - public Result>listIsReadAlready(){ + @GetMapping("/listStatusIgnore") + public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.listIsReadAlready(); + List list = service.listStatusIgnore(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listIsReadNoAlready") - public Result>listIsReadNoAlready(){ + + + + @GetMapping("/listStatusSolve") + public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.listIsReadNoAlready(); + List list = service.listStatusSolve(sysCarFaultLog); + return getDataTable(list); + } + + @GetMapping("/listStatusProcess") + public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.listStatusProcess(sysCarFaultLog); return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java index 3532fa5..c082d61 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java @@ -36,11 +36,12 @@ public class SysCarFaultLog extends BaseEntity { /** 结束时间*/ private Date updateTime; - /** 是否已读 */ - private Integer isRead; /** VIN码 */ private String vin; + /** 处理状态 1-解决 2-处理中 3-忽略 */ + private Integer status; + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java index 0c09fbd..cf09c18 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java @@ -15,6 +15,10 @@ import java.util.List; */ public interface SysCarFaultLogService extends IService { - public List listIsReadAlready( ); - public ListlistIsReadNoAlready( ); + public ListselectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog); + + public List listStatusIgnore(SysCarFaultLog sysCarFaultLog); + public ListlistStatusProcess(SysCarFaultLog sysCarFaultLog ); + + public ListlistStatusSolve(SysCarFaultLog sysCarFaultLog); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java index d6f291b..74b9fc8 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.breakdown.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.breakdown.domain.SysCarFaultLog; @@ -8,6 +9,8 @@ import com.muyu.breakdown.mapper.SysCarFaultLogMapper; import com.muyu.breakdown.mapper.SysCarFaultMapper; import com.muyu.breakdown.service.SysCarFaultLogService; import com.muyu.breakdown.service.SysCarFaultLogService; +import com.muyu.common.core.utils.StringUtils; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,13 +27,54 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl listIsReadAlready() { - return mapper.listIsReadAlready(); + public List selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()!=null){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); } @Override - public List listIsReadNoAlready() { - return mapper.listIsReadAlready(); + public List listStatusIgnore(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==3){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); } + + @Override + public List listStatusProcess(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==2){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); + } + + @Override + public List listStatusSolve(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==1){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); + } + + }