Merge remote-tracking branch 'origin/master'

src/main/java/com/om/config/WebMvcConfiguration.java

@@ -34,10 +34,10 @@ public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     protected void addInterceptors(InterceptorRegistry registry) {
         log.info("开始注册自定义拦截器...");
         //管理员拦截器
-        registry.addInterceptor(jwtTokenAdminInterceptor)
+    /*    registry.addInterceptor(jwtTokenAdminInterceptor)
                 .addPathPatterns("/web/**")
                 .excludePathPatterns(LoginConstant.ADMIN_ALLOWED_PATHS)
-                .excludePathPatterns(LoginConstant.KNIFE4J_PATHS);
+                .excludePathPatterns(LoginConstant.KNIFE4J_PATHS);*/
 
       /*  //用户拦截器
         registry.addInterceptor(jwtTokenUserInterceptor)

src/main/java/com/om/controller/admin/DiagnosisVersionInfoController.java

@@ -78,6 +78,7 @@ public class DiagnosisVersionInfoController {
     }
 
     @GetMapping("/release")
+    @ApiOperation("发布")
     public Result release(@RequestParam Integer id){
 
         return dvIoService.release(id);
@@ -85,16 +86,20 @@ public class DiagnosisVersionInfoController {
 
 
     @GetMapping("/repeal")
+    @ApiOperation("转为测试")
     public Result repeal(@RequestParam Integer id){
 
         return dvIoService.repeal(id);
     }
 
     @GetMapping("/upStatus")
-    @ApiOperation("修改诊断程序状态")
-    public Result upStatus(@RequestBody UpStatusDto upStatusDto){
+    @ApiOperation("下架")
+    public Result upStatus(@RequestParam Integer id){
 
-        return dvIoService.upStatus(upStatusDto);
+        return dvIoService.upStatus(id);
     }
 
+
+
+
 }

src/main/java/com/om/controller/admin/EmployeeController.java

@@ -146,6 +146,16 @@ public class EmployeeController {
         return Result.succ(employeeService.getOne(queryWrapper));
     }
 
+
+    @ApiOperation("修改员工状态")
+    @GetMapping("/status")
+    public Result updateStatus(@RequestParam Integer id,@RequestParam Integer status){
+        Employee employee = employeeService.getById(id);
+        employee.setStatus(status);
+        employeeService.updateById(employee);
+        return Result.ok();
+    }
+
     /**
      * 个人信息修改和保存
      *

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/dto/RepairQueryPageDTO.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;
@@ -21,10 +22,13 @@ public class RepairQueryPageDTO {
     @ApiModelProperty(value = "搜索字段---搜索VIN码")
     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/po/DiagnosisVersionInfo.java

@@ -100,7 +100,7 @@ public class DiagnosisVersionInfo implements Serializable {
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "版本号")
-    private String versionNum;
+    private String version;
 
     @ApiModelProperty(value = "状态")
     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/entity/vo/QueryRepairVO.java

@@ -47,6 +47,9 @@ public class QueryRepairVO implements Serializable {
     @ApiModelProperty(value = "报告序列号")
     private String repairSn;
 
+    @ApiModelProperty(value = "vin编号")
+    private String vin;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/om/service/IDiagnosisVersionInfoService.java

@@ -41,7 +41,7 @@ public interface IDiagnosisVersionInfoService extends IService<DiagnosisVersionI
 
     Result repeal(Integer id);
 
-    Result upStatus(UpStatusDto upStatusDto);
+    Result upStatus(Integer id);
 
     Result<List<VehicleDates>> diagnosisVersionInfoUpdate(AppDiagVersionUpdateDTO dto);
 }

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

@@ -62,11 +62,11 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         //诊断程序名称
         info.setDiagnosisName(diagnosisVersionVO.getDiagnosisName());
         //程序状态
-        info.setStatus(diagnosisVersionVO.getStatus());
+        info.setStatus(0);
         //设置用户名
         info.setUsername(diagnosisVersionVO.getUsername());
         //版本号
-        info.setVersionNum(diagnosisVersionVO.getVersion());
+        info.setVersion(diagnosisVersionVO.getVersion());
         //保存地址
         info.setSavePath(diagnosisVersionVO.getSavePath());
 
@@ -74,9 +74,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         this.save(info);
 
         LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DiagnosisVersionInfo::getDiagnosisName, diagnosisVersionVO.getDiagnosisName());
-        queryWrapper.eq(DiagnosisVersionInfo::getBrandCode, diagnosisVersionVO.getBrandCode());
-        queryWrapper.eq(DiagnosisVersionInfo::getUsername, diagnosisVersionVO.getUsername());
+        queryWrapper.eq(DiagnosisVersionInfo::getId, diagnosisVersionVO.getId());
         //保存后获取
         DiagnosisVersionInfo versionInfo = getOne(queryWrapper);
         log.info("==========={}=========", versionInfo);
@@ -187,6 +185,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
 
         Page<DiagnosisVersionInfo> page = this.lambdaQuery()
                 .like(StringUtils.isNotBlank(username), DiagnosisVersionInfo::getUsername, username)
+                .orderByDesc(DiagnosisVersionInfo::getUpdateTime)
                 .page(new Page<>(pageIndex, pageSize));
         //获取总的数据
         List<DiagnosisVersionInfo> diagLists = page.getRecords();
@@ -253,7 +252,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     @Override
     public Result repeal(Integer id) {
         DiagnosisVersionInfo info = this.getById(id);
-        info.setStatus(0);
+        info.setStatus(2);
         LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DiagnosisVersionInfo::getId, id);
         this.update(info, queryWrapper);
@@ -261,11 +260,18 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     }
 
     /*
-    目前用不上
+    修改状态
      */
     @Override
-    public Result upStatus(UpStatusDto upStatusDto) {
-        return null;
+    public Result upStatus(Integer id) {
+        DiagnosisVersionInfo info = this.getById(id);
+        info.setStatus(2);
+        LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DiagnosisVersionInfo::getId, id);
+        this.update(info, queryWrapper);
+        return Result.ok();
+
+
     }
 
     @Override
@@ -290,7 +296,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             DiagnosisVersionInfo diagnosisVersionInfo = this.lambdaQuery()
                     .eq(DiagnosisVersionInfo::getBrandCode, vehicleDates.getBrandCode())
                     .apply("CONCAT(',', client_number, ',') LIKE {0}", "%,"+clientNum+",%")
-                    .gt(DiagnosisVersionInfo::getVersionNum, version)
+                    .gt(DiagnosisVersionInfo::getVersion, version)
                     .one();
             if (BeanUtil.isEmpty(diagnosisVersionInfo)) {
                 return Result.fail("未获取到数据").result(ResultCode.NO_DATA);
@@ -303,7 +309,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
 
             VehicleDates vehicleDates1 = BeanUtil.copyProperties(diagnosisVersionInfo, VehicleDates.class);
             vehicleDates1.setUrl(diagnosisVersionInfo.getSavePath());
-            vehicleDates1.setVersion(diagnosisVersionInfo.getVersionNum());
+            vehicleDates1.setVersion(diagnosisVersionInfo.getVersion());
             vehicleDates1.setFileSize(diagnosisVersionInfo.getDiagnosisFileSize());
             vehicleDates1.setBrandCn(brand.getBrandCn());
             vehicleDates1.setBrandEn(brand.getBrandEn());

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());

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

@@ -290,13 +290,13 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
         LocalDateTime beginTime = dto.getBeginTime();
         LocalDateTime endTime = dto.getEndTime();
         String searchNum = dto.getSearchNum();
-        // String searchVIN = dto.getSearchVIN();
+        String searchVIN = dto.getSearchVIN();
         String searchDistributor = dto.getSearchDistributor();
 
         //分页查询
         Page<Repair> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(searchNum), Repair::getRepairNum, searchNum)
-                // .like(StringUtils.isNotBlank(searchVIN),Repair::)
+                .like(StringUtils.isNotBlank(searchNum), Repair::getSn, searchNum)
+                 .like(StringUtils.isNotBlank(searchVIN),Repair::getVin,searchVIN)
                 .like(StringUtils.isNotBlank(searchDistributor), Repair::getDepartmentName, searchDistributor)
                 .ge(beginTime != null, Repair::getCreateTime, beginTime)
                 .le(endTime != null, Repair::getCreateTime, endTime)

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

@@ -299,10 +299,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Result updateUserInfo(UserAddVO user) {
-        Integer userId = UserContext.getUserId();
+        Integer userId = user.getId();
+
         User userById = getById(userId);
         BeanUtil.copyProperties(user, userById);
-        userById.setId(userId);
+
+        this.updateById(userById);
 
         return Result.ok();
     }

src/main/java/com/om/utils/ITextPdfUtil.java

@@ -51,8 +51,8 @@ import java.util.Map;
 @Component
 public class ITextPdfUtil {
     //字体，我这里使用系统自带的simhei黑体
-    private static final String FONT = "C:/Windows/Fonts/simhei.ttf";
-    //private static final String FONT = "/usr/local/docker/opera/static/simhei.ttf";
+    //private static final String FONT = "C:/Windows/Fonts/simhei.ttf";
+    private static final String FONT = "/usr/local/docker/opera/static/simhei.ttf";
 
     @Value("${baseStatic}")
     private String baseStatic;

src/main/resources/application-dev.yml

@@ -45,8 +45,8 @@ files:
 photo:
   tmp: C:/temp/Photo/
 
-baseStatic: src/main/resources/template/static/
-#baseStatic: /usr/local/docker/opera/static/
+#baseStatic: src/main/resources/template/static/
+baseStatic: /usr/local/docker/opera/static/
 
 obs:
   ak: FL8POSPAPQDTW42RL8SN