From da110e67bd63931581a4cdcc2b2612d1560116ae 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: Thu, 26 Sep 2024 11:32:49 +0800 Subject: [PATCH] =?UTF-8?q?text:=E4=BF=AE=E6=94=B9=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA(=E6=94=B9=E4=B8=BA=E5=8F=8C=E8=A1=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/breakdown/controller/SysCarFaultController.java | 2 ++ .../main/java/com/muyu/breakdown/domain/SysCarFaultLog.java | 4 +++- .../com/muyu/breakdown/mapper/SysCarFaultLogMapper.java | 6 ++++++ .../java/com/muyu/breakdown/mapper/SysCarFaultMapper.java | 3 +++ .../com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java | 3 +++ .../java/com/muyu/breakdown/service/SysCarFaultService.java | 1 + .../muyu/breakdown/service/impl/SysCarFaultServiceImpl.java | 2 ++ .../breakdown/service/impl/sysCarFaultLogServiceImpl.java | 4 +++- 8 files changed, 23 insertions(+), 2 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java index f345165..62cafeb 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java @@ -42,6 +42,8 @@ public class SysCarFaultController extends BaseController 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 1a5fbc8..8379000 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 @@ -31,8 +31,10 @@ public class SysCarFaultLog extends BaseEntity { private Long id; /** 故障码编码 */ - @Excel(name = "故障码编码") + private Integer sysCarFaultId; + @Excel(name = "故障码编码") + private String faultCode; /**记录时间*/ @Excel(name = "记录时间") diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java index d5354aa..9067658 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java @@ -1,6 +1,7 @@ package com.muyu.breakdown.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.domain.SysCarFaultLog; import com.muyu.breakdown.domain.SysCarFaultMessage; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +23,9 @@ public interface SysCarFaultLogMapper extends BaseMapper { public List listIsReadAlready( ); @Select("select * from sys_car_fault_log where is_read=2") public ListlistISReadNotYet( ); + + + @Select("SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log log \n" + + "LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id ") + public Listlist(SysCarFaultLog SysCarFaultLog); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java index 1222a5a..978fc7c 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java @@ -27,4 +27,7 @@ public interface SysCarFaultMapper extends BaseMapper{ */ public List selectSysCarFaultIds(String[] ids); + + + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java index a76a167..c8bb91e 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java @@ -1,6 +1,7 @@ package com.muyu.breakdown.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.domain.SysCarFaultMessage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -23,4 +24,6 @@ public interface SysCarFaultMessageMapper extends BaseMapper @Select("select * from sys_car_fault_message where status=2") public ListlistStatusTwo( ); + + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java index 712e439..a801965 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java @@ -28,6 +28,7 @@ public interface SysCarFaultService extends IService { */ public List selectSysCarFaultList(SysCarFault sysCarFault); + /** * 判断 车辆故障管理 faultCode(故障码)是否唯一 * @param faultCode 车辆故障管理 diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java index eabfff5..e039170 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java @@ -67,6 +67,8 @@ public class SysCarFaultServiceImpl return this.list(queryWrapper); } + + /** * 唯一 判断 * @param faultCode 车辆故障管理 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 d5ede61..f12fdd1 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 @@ -26,6 +26,8 @@ import java.util.List; public class sysCarFaultLogServiceImpl extends ServiceImpl implements SysCarFaultLogService { + @Autowired + private SysCarFaultLogMapper sysCarFaultLogMapper; @Override public List selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) { @@ -36,7 +38,7 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl