4月5日bug调试修改

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

@@ -3,6 +3,7 @@ package com.om.entity.po;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,9 +54,11 @@ public class DiagnosticMenuVO implements Serializable {
     private String savePath;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "客户端名称集合")

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,6 +34,7 @@ public class VciInfo implements Serializable {
     private String bluetoothAddress;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "ID")
@@ -51,12 +54,14 @@ public class VciInfo implements Serializable {
     private String stockOutPerson;
 
     @ApiModelProperty(value = "出库时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime stockOutTime;
 
     @ApiModelProperty(value = "电话")
     private String tel;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "VCI编号")

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

@@ -16,6 +16,7 @@ import com.om.entity.vo.DiaMenuQueryPageVO;
 import com.om.entity.vo.DiaMenuUploadVO;
 import com.om.entity.vo.DistributorQueryPageVO;
 import com.om.exception.BadReqException;
+import com.om.exception.BizException;
 import com.om.mapper.DiagnosticMenuMapper;
 import com.om.service.IClientService;
 import com.om.service.IDiagnosticMenuService;
@@ -28,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -62,6 +64,19 @@ public class DiagnosticMenuServiceImpl extends ServiceImpl<DiagnosticMenuMapper,
         if (BeanUtil.isEmpty(dto)) {
             throw new BadReqException("数据为空");
         }
+       List<Integer> clientIds = new ArrayList<>();
+        try{
+            clientIds = Arrays.stream(dto.getClientIds().split(","))
+                    .map(Integer::parseInt)
+                    .collect(Collectors.toList());
+        }catch (Exception e){
+            throw new BizException("字符串转换数组错误，请检查字符串是否正确");
+        }
+        //查询 客户端id
+        List<Client> clients = clientService.listByIds(clientIds);
+        if (clients.isEmpty()){
+            throw new BadReqException("客户端查询错误");
+        }
 
         DiagnosticMenu diagnosticMenu = BeanUtil.copyProperties(dto, DiagnosticMenu.class);
         diagnosticMenu.setCreateTime(LocalDateTime.now());
@@ -152,10 +167,15 @@ public class DiagnosticMenuServiceImpl extends ServiceImpl<DiagnosticMenuMapper,
         List<DiagnosticMenuVO> voList = new ArrayList<>();
         for (DiagnosticMenu diagnosticMenu : records) {
             DiagnosticMenuVO diagnosticMenuVO = BeanUtil.copyProperties(diagnosticMenu, DiagnosticMenuVO.class);
+            List<Integer> clientIds = new ArrayList<>();
+            try{
+                clientIds = Arrays.stream(diagnosticMenu.getClientIds().split(","))
+                        .map(Integer::parseInt)
+                        .collect(Collectors.toList());
+            }catch (Exception e){
+                throw new BizException("字符串转换数组错误，请检查字符串是否正确");
+            }
 
-            List<Integer> clientIds = Arrays.stream(diagnosticMenu.getClientIds().split(","))
-                    .map(Integer::parseInt)
-                    .collect(Collectors.toList());
 
             //根据id集合批量查询 客户端
             List<Client> clients = clientService.listByIds(clientIds);

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

@@ -185,6 +185,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (addUser.getUsername() == null || addUser.getPassword() == null) {
             return Result.error();
         }
+
+        Integer distributorId = user.getDistributorId();
+        //根据id查询维修厂
+        Distributor distributor = distributorService.getById(distributorId);
+        if (BeanUtil.isEmpty(distributor)){
+            throw new BadReqException("该维修厂不存在");
+        }
+        addUser.setDistributorName(distributor.getCompany());
+
         this.save(addUser);
 
         return Result.ok();
@@ -303,7 +312,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         User userById = getById(userId);
         BeanUtil.copyProperties(user, userById);
-
+        Integer distributorId = userById.getDistributorId();
+        //根据id查询维修厂
+        Distributor distributor = distributorService.getById(distributorId);
+        if (BeanUtil.isEmpty(distributor)){
+            throw new BadReqException("该维修厂不存在");
+        }
+        userById.setDistributorName(distributor.getCompany());
         this.updateById(userById);
 
         return Result.ok();

src/main/resources/application-dev.yml

@@ -38,8 +38,8 @@ jwt:
 # 手册视频上传路径
 files:
   upload:
-#    path: /Users/wangwulin/Desktop/
-    path: C:/temp/
+    path: /Users/wangwulin/Desktop/
+    #path: C:/temp/
 
 # 照片存放路径
 photo:

src/main/resources/template/static/report.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>车辆诊断报告</title>
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     <style>
         body {
             font-family: Arial, sans-serif;