diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 38c7f2a..a0515a2 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index cf1cc9f..de95a70 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: 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 a8c8b6c..72f4d2c 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 @@ -1,5 +1,6 @@ package com.muyu.breakdown.controller; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.service.SysCarFaultService; import com.muyu.common.core.domain.Result; @@ -72,12 +73,13 @@ public class SysCarFaultController extends BaseController @Validated @RequestBody SysCarFault sysCarFault) { if (sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("新增 车辆故障管理 '" + sysCarFault + "'失败，车辆故障管理已存在"); + return error("新增 车辆故障管理 ,失败，车辆故障码已存在"); } sysCarFault.setCreateBy(SecurityUtils.getUsername()); return toAjax(sysCarFaultService.save(sysCarFault)); } + /** * 修改车辆故障管理 */ @@ -103,4 +105,28 @@ public class SysCarFaultController extends BaseController sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); return success(); } + + /** + * 启用告警 + * @param id + */ + @PutMapping("/enableWarningsById/{id}") + public void enableWarningsById(@PathVariable("id")Long id){ + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("id",id); + wrapper.set("warn_status",0); + sysCarFaultService.update(wrapper); + } + /** + * 禁用告警 + * @param id + */ + @PutMapping("/disableWarningsById/{id}") + public void disableWarningsById(@PathVariable("id")Long id){ + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("id",id); + wrapper.set("warn_status",1); + sysCarFaultService.update(wrapper); + } + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java new file mode 100644 index 0000000..5c15d04 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java @@ -0,0 +1,48 @@ +package com.muyu.breakdown.controller; + +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.service.SysCarFaultMessageService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:39 + */ +@RestController +@RequestMapping("/message") +public class SysCarFaultMessageController extends BaseController { + @Autowired + private SysCarFaultMessageService service; + + @GetMapping("/list") + public Result> list(){ + startPage(); + List list = service.list(); + return getDataTable(list); + } + + @GetMapping("/listStatusOne") + public Result>listStatusOne(){ + startPage(); + List list = service.listStatusOnt(); + return getDataTable(list); + } + + @GetMapping("/listStatusTwo") + public Result>listStatusTwo(){ + startPage(); + List list = service.listStatusTwo(); + return getDataTable(list); + } +} 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 new file mode 100644 index 0000000..0275a29 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -0,0 +1,62 @@ +package com.muyu.breakdown.controller; + +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.service.SysCarFaultLogService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:08 + */ +@RestController +@RequestMapping("/log") +public class sysCarFaultLogController extends BaseController { + @Autowired + private SysCarFaultLogService service; + + @PostMapping("/list") + public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.selectSysCarFaultLogList(sysCarFaultLog); + return getDataTable(list); + } + + @PostMapping("/listStatusIgnore") + public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.listStatusIgnore(sysCarFaultLog); + return getDataTable(list); + } + + + + + @PostMapping("/listStatusSolve") + public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.listStatusSolve(sysCarFaultLog); + return getDataTable(list); + } + + @PostMapping("/listStatusProcess") + public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.listStatusProcess(sysCarFaultLog); + return getDataTable(list); + } + + @PostMapping("/add") + public Result add(@RequestBody SysCarFaultLog sysCarFaultLog){ + + return toAjax(service.save(sysCarFaultLog)); + } + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java index 7abee76..f8fae99 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java @@ -30,6 +30,7 @@ public class SysCarFault extends BaseEntity{ @TableId( type = IdType.AUTO) private Long id; + /** 故障码编码 */ @Excel(name = "故障码编码") private String faultCode; @@ -42,17 +43,13 @@ public class SysCarFault extends BaseEntity{ @Excel(name = "故障类型") private Long typeId; - /** 车辆VIN码 */ - @Excel(name = "车辆VIN码") - private String carVin; + /** 故障标签 */ @Excel(name = "故障标签") private String faultLabel; - /** 故障组 */ - @Excel(name = "故障组") - private String faultGroup; + /** 故障位 */ @Excel(name = "故障位") @@ -80,11 +77,11 @@ public class SysCarFault extends BaseEntity{ /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") - private Long status; + private Integer status; /** 是否警告(0.开启 1.禁止) */ @Excel(name = "是否警告(0.开启 1.禁止)") - private Long warnStatus; + private Integer warnStatus; @@ -95,9 +92,7 @@ public class SysCarFault extends BaseEntity{ .append("faultCode", getFaultCode()) .append("faultName", getFaultName()) .append("typeId", getTypeId()) - .append("carVin", getCarVin()) .append("faultLabel", getFaultLabel()) - .append("faultGroup", getFaultGroup()) .append("faultBit", getFaultBit()) .append("faultValue", getFaultValue()) .append("faultRank", getFaultRank()) 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 new file mode 100644 index 0000000..c082d61 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java @@ -0,0 +1,47 @@ +package com.muyu.breakdown.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 20:17 + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_car_fault_log") +public class SysCarFaultLog extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @TableId( type = IdType.AUTO) + private Long id; + /** 故障码编码 */ + private Integer sysCarFaultId; + /**记录时间*/ + private Date createTime; + + /** 结束时间*/ + private Date updateTime; + + + /** VIN码 */ + private String vin; + + /** 处理状态 1-解决 2-处理中 3-忽略 */ + private Integer status; + + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java new file mode 100644 index 0000000..d73baa6 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java @@ -0,0 +1,41 @@ +package com.muyu.breakdown.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassDescription: 站内信息对象 sys_car_fault_message + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 11:57 + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_car_fault_message") +public class SysCarFaultMessage extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 内容 */ + private String content; + + /**开始时间 */ + private Date createTime; + + /**是否已读 */ + private Integer status; + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java deleted file mode 100644 index cc04b83..0000000 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.breakdown.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - -/** - * @ClassDescription: - * @JdkVersion: 1.8 - * @Author: YZL - * @Created: 2024/9/20 11:34 - */ -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_fault_type") -public class SysCarFaultType { - private Long faultTypeId; - private String faultTypeName; -} 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 new file mode 100644 index 0000000..d5354aa --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java @@ -0,0 +1,25 @@ +package com.muyu.breakdown.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:06 + */ +@Mapper +public interface SysCarFaultLogMapper extends BaseMapper { + + + @Select("select * from sys_car_fault_log where is_read=1") + public List listIsReadAlready( ); + @Select("select * from sys_car_fault_log where is_read=2") + public ListlistISReadNotYet( ); +} 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 new file mode 100644 index 0000000..e2ac860 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java @@ -0,0 +1,24 @@ +package com.muyu.breakdown.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 11:59 + */ +@Mapper +public interface SysCarFaultMessageMapper extends BaseMapper { + + @Select("select * from sys_car_fault_message where status=1") + public ListlistStatusOnt( ); + @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/SysCarFaultLogService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java new file mode 100644 index 0000000..cf09c18 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java @@ -0,0 +1,24 @@ +package com.muyu.breakdown.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.domain.SysCarFaultLog; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:07 + */ +public interface SysCarFaultLogService extends IService { + + 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/SysCarFaultMessageService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java new file mode 100644 index 0000000..fd98eb6 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java @@ -0,0 +1,21 @@ +package com.muyu.breakdown.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.breakdown.domain.SysCarFault; +import com.muyu.breakdown.domain.SysCarFaultMessage; + +import java.util.List; +import java.util.stream.IntStream; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:35 + */ +public interface SysCarFaultMessageService extends IService { + public List selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage); + + public ListlistStatusOnt( ); + 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 604c27d..0251a0a 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 @@ -35,4 +35,6 @@ public interface SysCarFaultService extends IService { */ Boolean checkIdUnique(SysCarFault sysCarFault); + + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java new file mode 100644 index 0000000..c780aaf --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java @@ -0,0 +1,38 @@ +package com.muyu.breakdown.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.breakdown.domain.SysCarFault; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.mapper.SysCarFaultMessageMapper; +import com.muyu.breakdown.service.SysCarFaultMessageService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:36 + */ +@Service +public class SysCarFaultMessageServiceImpl extends ServiceImpl implements SysCarFaultMessageService { + + @Override + public List selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + return baseMapper.selectList(wrapper); + } + + @Override + public List listStatusOnt( ) { + return baseMapper.listStatusOnt(); + } + + @Override + public List listStatusTwo( ) { + return baseMapper.listStatusTwo(); + } +} 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 717933a..148c3b1 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 @@ -57,6 +57,9 @@ public class SysCarFaultServiceImpl if (sysCarFault.getFaultRank()!=null){ queryWrapper.eq(SysCarFault::getFaultRank, sysCarFault.getFaultRank()); } + if (sysCarFault.getTypeId()!=null){ + queryWrapper.eq(SysCarFault::getTypeId,sysCarFault.getTypeId()); + } return this.list(queryWrapper); } @@ -69,7 +72,10 @@ public class SysCarFaultServiceImpl public Boolean checkIdUnique(SysCarFault sysCarFault) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysCarFault::getId, sysCarFault.getId()); - return this.count(queryWrapper) > 0; + queryWrapper.eq(SysCarFault::getFaultCode,sysCarFault.getFaultCode()); + return this.count(queryWrapper) == 0; } + + } 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 new file mode 100644 index 0000000..85c68ea --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -0,0 +1,84 @@ +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; +import com.muyu.breakdown.domain.SysCarFaultLog; +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; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:07 + */ +@Service +public class sysCarFaultLogServiceImpl extends ServiceImpl implements SysCarFaultLogService { + + + + @Override + 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); + } + + /** + * 只展示忽略的数据 + * @param sysCarFaultLog + * @return + */ + @Override + public List listStatusIgnore(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,3); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + return this.list(wrapper); + } + + /** + * 只展示处理中的数据 + * @param sysCarFaultLog + * @return + */ + @Override + public List listStatusProcess(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,2); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + return this.list(wrapper); + } + + //只展示已解决的数据 + @Override + public List listStatusSolve(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,1); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + return this.list(wrapper); + } + + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml index 9ce45cb..a7f2757 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml index 4b3f17d..da76fb2 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml @@ -9,9 +9,7 @@ - - @@ -28,7 +26,7 @@ - select id, fault_code, fault_name, type_id, car_vin, fault_label, fault_group, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault + select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault