对接诊断日志

src/main/java/com/om/entity/dto/APPRepairQueryPageDTO.java

@@ -1,5 +1,6 @@
 package com.om.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,9 +25,11 @@ public class APPRepairQueryPageDTO extends AppBaseDTO{
     private String searchVIN;
 
     @ApiModelProperty(value = "搜索字段---开始时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime beginTime;
 
     @ApiModelProperty(value = "搜索字段---结束时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "搜索字段---搜索维修厂")

src/main/java/com/om/entity/dto/DiaLogQueryPageDTO.java

@@ -1,5 +1,6 @@
 package com.om.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,15 +16,17 @@ public class DiaLogQueryPageDTO {
     @ApiModelProperty(value = "每个页码的大小")
     private Integer pageSize;
 
-    @ApiModelProperty(value = "搜索字段---设备sn号")
+    @ApiModelProperty(value = "搜索字段---设备vcisn号")
     private String vciSn;
 
     @ApiModelProperty(value = "搜索字段---用户名")
     private String account;
 
     @ApiModelProperty(value = "搜索字段---开始时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime beginTime;
 
     @ApiModelProperty(value = "搜索字段---结束时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime endTime;
 }

src/main/java/com/om/entity/dto/DiagnoseLogVehicleInfo.java

@@ -1,5 +1,6 @@
 package com.om.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,9 +29,11 @@ public class DiagnoseLogVehicleInfo {
     private String nameLog;
 
     @ApiModelProperty(value = "诊断日志保存时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime nameTimePoint;
 
     @ApiModelProperty(value = "记录时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime recordTime;
 
     @ApiModelProperty(value = "保存路径")

src/main/java/com/om/entity/dto/DiagnosisInfoDTO.java

@@ -1,5 +1,6 @@
 package com.om.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,6 +18,7 @@ public class DiagnosisInfoDTO implements Serializable {
    private String brandName;
    private String clientName;
    private String fileSize;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private LocalDateTime createTime;
    private Integer status;
 }

src/main/java/com/om/entity/po/DiagnosticLog.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,8 +34,8 @@ public class DiagnosticLog implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
+    @ApiModelProperty(value = "用户名")
+    private String username;
 
     @ApiModelProperty(value = "激活路径")
     private String activePath;
@@ -48,6 +50,7 @@ public class DiagnosticLog implements Serializable {
     private String country;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "日期文件夹名称")
@@ -57,19 +60,22 @@ public class DiagnosticLog implements Serializable {
     private String nameLog;
 
     @ApiModelProperty(value = "诊断日志保存时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime nameTimePoint;
 
     @ApiModelProperty(value = "记录时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime recordTime;
 
     @ApiModelProperty(value = "保存路径")
     private String savePath;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "VCI设备ID")
-    private Integer vciId;
+    @ApiModelProperty(value = "VCI设备Sn")
+    private String vciSn;
 
     @ApiModelProperty(value = "车型ID")
     private Integer vehicleId;

src/main/java/com/om/service/impl/DiagnosticLogServiceImpl.java

@@ -60,34 +60,13 @@ public class DiagnosticLogServiceImpl extends ServiceImpl<DiagnosticLogMapper, D
         Integer pageSize = dto.getPageSize();
         LocalDateTime beginTime = dto.getBeginTime();
         LocalDateTime endTime = dto.getEndTime();
-        User one = new User();
-        if (StringUtils.isNotBlank(dto.getAccount())) {
-            //根据用户名查询用户
-            one = userService.lambdaQuery()
-                    .eq(User::getUsername, dto.getAccount())
-                    .one();
-
-            if (BeanUtil.isEmpty(one)){
-                throw new BadReqException("该查询用户不存在");
-            }
-        }
-
+        String vciSn = dto.getVciSn();
+        String account = dto.getAccount();
 
-        VciInfo vciInfo = new VciInfo();
-        if (StringUtils.isNotBlank(dto.getVciSn())) {
-            //根据vciSn查询VCI
-            vciInfo = vciInfoService.lambdaQuery()
-                    .eq(VciInfo::getVciNum, dto.getVciSn())
-                    .one();
-
-            if (BeanUtil.isEmpty(vciInfo)){
-                throw new BadReqException("该查询vci不存在");
-            }
-        }
 
         Page<DiagnosticLog> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(dto.getAccount()), DiagnosticLog::getUserId, one.getId())
-                .like(StringUtils.isNotBlank(dto.getVciSn()), DiagnosticLog::getVciId, vciInfo.getId())
+                .like(StringUtils.isNotBlank(account), DiagnosticLog::getUsername, account)
+                .like(StringUtils.isNotBlank(vciSn), DiagnosticLog::getVciSn, vciSn)
                 .ge(beginTime != null, DiagnosticLog::getCreateTime, beginTime)
                 .le(endTime != null, DiagnosticLog::getCreateTime, endTime)
                 .orderByDesc(DiagnosticLog::getCreateTime)
@@ -107,16 +86,14 @@ public class DiagnosticLogServiceImpl extends ServiceImpl<DiagnosticLogMapper, D
         List<DiaLogQueryVO> diaLogQueryVOS = new ArrayList<>();
         for (DiagnosticLog record : records) {
             DiaLogQueryVO diaLogQueryVO = BeanUtil.copyProperties(record, DiaLogQueryVO.class);
-            User user = userService.getById(record.getUserId());
-            diaLogQueryVO.setAccount(user.getUsername());
+            diaLogQueryVO.setAccount(record.getUsername());
             Brand brand = brandService.getById(record.getBrandId());
             diaLogQueryVO.setBrand(brand.getBrandCn());
 
             Client client = clientService.getById(record.getClientId());
             diaLogQueryVO.setClientNum(client.getNumber());
 
-            VciInfo vci = vciInfoService.getById(record.getVciId());
-            diaLogQueryVO.setVciSn(vci.getVciNum());
+            diaLogQueryVO.setVciSn(record.getVciSn());
 
             //todo 车型id vehicleId 查询车型
 
@@ -201,7 +178,7 @@ public class DiagnosticLogServiceImpl extends ServiceImpl<DiagnosticLogMapper, D
             if (BeanUtil.isEmpty(brand)){
                 throw new BadReqException("该品牌不存在！！！");
             }
-            diagnosticLog.setVciId(vciInfo.getId());
+            diagnosticLog.setVciSn(vciInfo.getVciNum());
             diagnosticLog.setBrandId(brand.getId());
             diagnosticLog.setCreateTime(LocalDateTime.now());
             diagnosticLog.setUpdateTime(LocalDateTime.now());