feat:站内信信息状态修改

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:

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:

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);
     }
 
+
+
     /**
      * 导出车辆故障管理列表
      */
@@ -72,9 +74,13 @@ public class SysCarFaultController extends BaseController
     public Result<Integer> add(
             @Validated @RequestBody SysCarFault sysCarFault)
     {
-        if (sysCarFaultService.checkIdUnique(sysCarFault)) {
+        //判断故障码是否重复
-            return error("新增 车辆故障管理 ,失败，车辆故障码已存在");
+        SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode());
+        if (selectFaultByFaultCode!=null){
+            return error("新增车辆故障 ,故障码已存在");
         }
+
+
         sysCarFault.setCreateBy(SecurityUtils.getUsername());
         return toAjax(sysCarFaultService.save(sysCarFault));
     }
@@ -88,9 +94,7 @@ public class SysCarFaultController extends BaseController
     public Result<Integer> edit(
             @Validated @RequestBody SysCarFault sysCarFault)
     {
-        if (!sysCarFaultService.checkIdUnique(sysCarFault)) {
+
-            return error("修改 车辆故障管理 '" + sysCarFault + "'失败，车辆故障管理不存在");
-        }
         sysCarFault.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(sysCarFaultService.updateById(sysCarFault));
     }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java

@@ -1,14 +1,13 @@
 package com.muyu.breakdown.controller;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -25,6 +24,10 @@ public class SysCarFaultMessageController extends BaseController {
     @Autowired
     private SysCarFaultMessageService service;
 
+    /**
+     * 查询所有故障信息
+     * @return
+     */
     @GetMapping("/list")
     public Result<TableDataInfo<SysCarFaultMessage>> list(){
         startPage();
@@ -32,6 +35,11 @@ public class SysCarFaultMessageController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询状态为1的故障信息
+     * @return
+     */
+
     @GetMapping("/listStatusOne")
     public Result<TableDataInfo<SysCarFaultMessage>>listStatusOne(){
         startPage();
@@ -39,10 +47,27 @@ public class SysCarFaultMessageController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询状态为2的故障信息
+     * @return
+     */
     @GetMapping("/listStatusTwo")
     public Result<TableDataInfo<SysCarFaultMessage>>listStatusTwo(){
         startPage();
         List<SysCarFaultMessage> list = service.listStatusTwo();
         return getDataTable(list);
     }
+    /**
+     * 修改未读站内信息为已读
+     * @param id
+     * @return
+     */
+    @PutMapping("/updateStatusById/{id}")
+    public Result updateStatusById(@PathVariable("id")Long id){
+        UpdateWrapper<SysCarFaultMessage> wrapper = new UpdateWrapper<>();
+        wrapper.eq("id",id);
+        wrapper.set("status",1);
+        boolean update = service.update(wrapper);
+        return Result.success(update);
+    }
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java

@@ -1,13 +1,18 @@
 package com.muyu.breakdown.controller;
 
+import cn.hutool.http.server.HttpServerResponse;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.service.SysCarFaultLogService;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -59,4 +64,28 @@ public class sysCarFaultLogController extends BaseController {
         return toAjax(service.save(sysCarFaultLog));
     }
 
+    @PostMapping("/export")
+    public void  export(HttpServletResponse response, SysCarFaultLog sysCarFaultLog){
+        List<SysCarFaultLog> list = service.selectSysCarFaultLogList(sysCarFaultLog);
+        ExcelUtil<SysCarFaultLog> util = new ExcelUtil<SysCarFaultLog>(SysCarFaultLog.class);
+        util.exportExcel(response,list,"车辆故障记录数据");
+    }
+
+    /**
+     *  修改为忽略
+     * @param idsStr
+     * @return
+     */
+    @PutMapping("/updateStatusById/{ids}")
+    public Result updateStatusById(@PathVariable("ids")String idsStr){
+        Long[] ids = Arrays.stream(idsStr.split(","))
+                .map(Long::valueOf)
+                .toArray(Long[]::new);
+        UpdateWrapper<SysCarFaultLog> wrapper = new UpdateWrapper<>();
+        wrapper.in("id",ids).set("status",3);
+        boolean update = service.update(null, wrapper);
+        return Result.success(update);
+    }
+
+
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java

@@ -83,6 +83,10 @@ public class SysCarFault extends BaseEntity{
     @Excel(name = "是否警告(0.开启 1.禁止)")
     private Integer warnStatus;
 
+    /**车辆类型 */
+    @Excel(name = "车辆类型")
+    private Integer carTypeId;
+
 
 
     @Override

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java

@@ -3,6 +3,7 @@ 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.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -28,19 +29,28 @@ public class SysCarFaultLog extends BaseEntity {
     /** 参数主键 */
     @TableId( type = IdType.AUTO)
     private Long id;
+
     /** 故障码编码 */
+
     private Integer sysCarFaultId;
+    @Excel(name = "故障码编码")
+    private String faultCode;
+
     /**记录时间*/
+    @Excel(name = "记录时间")
     private Date createTime;
 
     /** 结束时间*/
+    @Excel(name = "结束时间")
     private Date updateTime;
 
 
     /** VIN码 */
+    @Excel(name = "VIN码")
     private String vin;
 
     /** 处理状态 1-解决 2-处理中 3-忽略 */
+    @Excel(name = "处理状态 1-解决 2-处理中 3-忽略")
     private Integer status;
 
 

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/sysCarEnterprise.java

@@ -0,0 +1,58 @@
+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.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.*;
+
+/**
+ * @ClassDescription:
+ * @JdkVersion: 1.8
+ * @Author: YZL
+ * @Created: 2024/9/26 19:54
+ */
+
+@Data
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("sys_car_enterprise")
+public class sysCarEnterprise  extends BaseEntity  {
+    private static final  long serialVersionUID = 1L;
+
+    /** 企业id*/
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 企业名称*/
+    @Excel(name = "企业名称")
+    private String enterpriseName;
+    /** 用户姓名 */
+    @Excel(name = "用户姓名")
+    private String name;
+
+    @Excel(name = "用户职位")
+    private String position;
+
+    @Excel(name = "公司所在省")
+    private String province;
+
+    @Excel(name = "公司所在市")
+    private String city;
+
+    @Excel(name = "公司所在县/区")
+    private String county;
+
+    @Excel(name = "公司详细地址")
+    private String address;
+
+    @Excel(name = "统一社会信用代码")
+    private String creditCode;
+
+    @Excel(name = "营业执照")
+    private String businessLicense;
+
+}

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;
@@ -18,8 +19,18 @@ import java.util.List;
 public interface SysCarFaultLogMapper extends BaseMapper<SysCarFaultLog> {
 
 
-    @Select("select * from sys_car_fault_log where is_read=1")
+
-    public List<SysCarFaultLog> listIsReadAlready( );
+
-    @Select("select * from sys_car_fault_log where is_read=2")
+
-    public List<SysCarFaultLog>listISReadNotYet( );
+
+    public List<SysCarFaultLog>selectSysCarFaultLogList(SysCarFaultLog SysCarFaultLog);
+
+
+    public List<SysCarFaultLog>listStatusSolve(SysCarFaultLog sysCarFaultLog);
+
+
+    public List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog);
+
+
+    public List<SysCarFaultLog>listStatusIgnore(SysCarFaultLog sysCarFaultLog);
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java

@@ -3,6 +3,9 @@ package com.muyu.breakdown.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.breakdown.domain.SysCarFault;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @ClassDescription: 车辆故障管理Mapper接口
@@ -13,4 +16,18 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysCarFaultMapper extends BaseMapper<SysCarFault>{
 
+    //根据添加的故障码进行查询
+    @Select("select fault_code from sys_car_fault where fault_code=#{faultCode}")
+     SysCarFault selectFaultByFaultCode(String faultCode);
+
+    /**
+     *  查询故障码信息
+     * @param ids 故障码信息主键
+     * @return 故障码信息
+     */
+    public List<SysCarFault> selectSysCarFaultIds(String[] ids);
+
+
+
+
 }

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;
@@ -16,9 +17,13 @@ import java.util.List;
 @Mapper
 public interface SysCarFaultMessageMapper extends BaseMapper<SysCarFaultMessage> {
 
+    // 查询状态等于1的记录
     @Select("select * from sys_car_fault_message where status=1")
     public List<SysCarFaultMessage>listStatusOnt( );
+    //查询状态等于2的记录
     @Select("select * from sys_car_fault_message where status=2")
     public List<SysCarFaultMessage>listStatusTwo( );
 
+
+
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java

@@ -2,8 +2,6 @@ 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;
 
@@ -21,4 +19,6 @@ public interface SysCarFaultLogService extends IService<SysCarFaultLog> {
     public List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog );
 
     public List<SysCarFaultLog>listStatusSolve(SysCarFaultLog sysCarFaultLog);
+
+
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java

@@ -14,8 +14,19 @@ import java.util.stream.IntStream;
  * @Created: 2024/9/22 14:35
  */
 public interface SysCarFaultMessageService extends IService<SysCarFaultMessage> {
+
+    //查询列表所有数据(分页)
     public List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage);
 
+    /**
+     * 查询列表中状态为1数据(分页)
+     * @return
+     */
     public List<SysCarFaultMessage>listStatusOnt( );
+
+    /**
+     * 查询列表中状态为2的数据(分页)
+     * @return
+     */
     public List<SysCarFaultMessage>listStatusTwo( );
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java

@@ -28,12 +28,14 @@ public interface SysCarFaultService extends IService<SysCarFault> {
      */
     public List<SysCarFault> selectSysCarFaultList(SysCarFault sysCarFault);
 
+
     /**
-     * 判断 车辆故障管理 id是否唯一
+     * 判断 车辆故障管理 faultCode(故障码)是否唯一
-     * @param sysCarFault 车辆故障管理
+     * @param faultCode 车辆故障管理
      * @return 结果
      */
-    Boolean checkIdUnique(SysCarFault sysCarFault);
+
+    SysCarFault selectFaultByFaultCode(String faultCode);
 
 
 

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java

@@ -20,17 +20,30 @@ import java.util.List;
 @Service
 public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessageMapper, SysCarFaultMessage> implements SysCarFaultMessageService {
 
+    /**
+     * 查询故障消息列表
+     * @param sysCarFaultMessage
+     * @return
+     */
     @Override
     public List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage) {
         LambdaQueryWrapper<SysCarFaultMessage> wrapper = new LambdaQueryWrapper<>();
         return baseMapper.selectList(wrapper);
     }
 
+    /**
+     * 查询故障消息列表中状态为1的故障消息
+     * @return
+     */
     @Override
     public List<SysCarFaultMessage> listStatusOnt( ) {
         return baseMapper.listStatusOnt();
     }
 
+    /**
+     * 查询故障消息列表中状态为2的故障消息
+     * @return
+     */
     @Override
     public List<SysCarFaultMessage> listStatusTwo( ) {
         return baseMapper.listStatusTwo();

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java

@@ -6,6 +6,7 @@ import com.muyu.breakdown.domain.SysCarFault;
 import com.muyu.breakdown.mapper.SysCarFaultMapper;
 import com.muyu.breakdown.service.SysCarFaultService;
 import com.muyu.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -22,6 +23,9 @@ public class SysCarFaultServiceImpl
         extends ServiceImpl<SysCarFaultMapper, SysCarFault>
         implements SysCarFaultService {
 
+    @Autowired
+    private SysCarFaultMapper mapper;
+
     /**
      * 精确查询车辆故障管理
      *
@@ -57,25 +61,29 @@ public class SysCarFaultServiceImpl
         if (sysCarFault.getFaultRank()!=null){
             queryWrapper.eq(SysCarFault::getFaultRank, sysCarFault.getFaultRank());
         }
+        //故障码类型
         if (sysCarFault.getTypeId()!=null){
             queryWrapper.eq(SysCarFault::getTypeId,sysCarFault.getTypeId());
         }
+        //车辆类型查询
+        if (sysCarFault.getCarTypeId()!=null){
+            queryWrapper.eq(SysCarFault::getCarTypeId,sysCarFault.getTypeId());
+        }
         return this.list(queryWrapper);
     }
 
+
+
     /**
      * 唯一 判断
-     * @param sysCarFault 车辆故障管理
+     * @param faultCode 车辆故障管理
      * @return 车辆故障管理
      */
+
     @Override
-    public Boolean checkIdUnique(SysCarFault sysCarFault) {
+    public SysCarFault selectFaultByFaultCode(String faultCode) {
-        LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
+        return mapper.selectFaultByFaultCode(faultCode);
-        queryWrapper.eq(SysCarFault::getId, sysCarFault.getId());
-        queryWrapper.eq(SysCarFault::getFaultCode,sysCarFault.getFaultCode());
-        return this.count(queryWrapper) == 0;
     }
 
 
-
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java

@@ -3,6 +3,7 @@ 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.SysCarFault;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.mapper.SysCarFaultLogMapper;
@@ -26,17 +27,13 @@ import java.util.List;
 public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper, SysCarFaultLog> implements SysCarFaultLogService {
 
 
+    @Autowired
+    private SysCarFaultLogMapper sysCarFaultLogMapper;
 
     @Override
     public List<SysCarFaultLog> selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
+
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
+        return sysCarFaultLogMapper.selectSysCarFaultLogList(sysCarFaultLog);
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        if (sysCarFaultLog.getStatus()!=null){
-            wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus());
-        }
-        return this.list(wrapper);
     }
 
     /**
@@ -46,12 +43,8 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
+
-        wrapper.eq(SysCarFaultLog::getStatus,3);
+        return sysCarFaultLogMapper.listStatusIgnore(sysCarFaultLog);
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        return this.list(wrapper);
     }
 
     /**
@@ -61,24 +54,16 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusProcess(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
+
-        wrapper.eq(SysCarFaultLog::getStatus,2);
+        return sysCarFaultLogMapper.listStatusProcess(sysCarFaultLog);
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        return this.list(wrapper);
     }
 
     //只展示已解决的数据
     @Override
     public List<SysCarFaultLog> listStatusSolve(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
+        return sysCarFaultLogMapper.listStatusSolve(sysCarFaultLog);
-        wrapper.eq(SysCarFaultLog::getStatus,1);
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        return this.list(wrapper);
     }
 
 
+
 }

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:

cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultLogMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muyu.breakdown.mapper.SysCarFaultLogMapper">
+
+    <resultMap type="com.muyu.breakdown.domain.SysCarFaultLog" id="SysCarFaultLogResult">
+        <result property="id"    column="id"    />
+        <result property="sysCarFaultId" column="sys_car_fault_id"/>
+        <result property="faultCode" column="fault_code"/>
+        <result property="vin" column="vin"/>
+        <result property="status"    column="status"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSysCarFaultLogVo">
+        SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log  log LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id
+    </sql>
+
+    <select id="selectSysCarFaultLogList" parameterType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
+        <include refid="selectSysCarFaultLogVo"/>
+        <where>
+            <if test="faultCode != null  and faultCode != ''"> and fault.fault_code = #{faultCode}</if>
+            <if test="vin != null  and vin != ''"> and log.vin = #{vin}</if>
+            <if test="status != null "> and log.status = #{status}</if>
+        </where>
+    </select>
+    <select id="listStatusSolve" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
+        <include refid="selectSysCarFaultLogVo" />
+        <where>
+            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
+            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
+            and log.status=1
+        </where>
+    </select>
+    <select id="listStatusProcess" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
+        <include refid="selectSysCarFaultLogVo" />
+        <where>
+            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
+            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
+            and log.status=2
+        </where>
+    </select>
+    <select id="listStatusIgnore" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
+        <include refid="selectSysCarFaultLogVo" />
+        <where>
+            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
+            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
+            and log.status=3
+        </where>
+    </select>
+
+
+    <delete id="deleteSysCarFaultByIds" parameterType="String">
+        delete from sys_car_fault where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+</mapper>

cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml

@@ -23,10 +23,11 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="carTypeId" column="car_type_id"/>
     </resultMap>
 
     <sql id="selectSysCarFaultVo">
-        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
+        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,car_type_id from sys_car_fault
     </sql>
 
     <select id="selectSysCarFaultList" parameterType="com.muyu.breakdown.domain.SysCarFault" resultMap="SysCarFaultResult">
@@ -42,6 +43,13 @@
         <include refid="selectSysCarFaultVo"/>
         where id = #{id}
     </select>
+    <select id="selectSysCarFaultIds" resultMap="SysCarFaultResult">
+        <include refid="selectSysCarFaultVo"/>
+            where id in
+            <foreach collection="array" item="id" index="index" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+    </select>
 
     <insert id="insertSysCarFault" parameterType="com.muyu.breakdown.domain.SysCarFault" useGeneratedKeys="true" keyProperty="id">
         insert into sys_car_fault
@@ -63,6 +71,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="carTypeId !=null">car_type_id</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="faultCode != null and faultCode != ''">#{faultCode},</if>
@@ -82,6 +91,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="carTypeId != null">#{catTypeId}</if>
         </trim>
     </insert>
 
@@ -105,6 +115,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="carTypeId !=null">car_type_id=#{catTypeId}</if>
         </trim>
         where id = #{id}
     </update>

cloud-modules/cloud-modules-car/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:

cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml

@@ -6,7 +6,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:

cloud-modules/cloud-modules-file/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:

cloud-modules/cloud-modules-gen/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:

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -96,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param firm 用户名
      *
      * @return 用户对象信息
      */

cloud-modules/cloud-modules-system/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:

cloud-visual/cloud-visual-monitor/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: