app端获取刷写文件修改文件名和大小，获取诊断程序的执行失败修改

src/main/java/com/om/entity/vo/AppBrushFileVO.java

@@ -18,7 +18,7 @@ public class AppBrushFileVO {
     private String fileName;
 
     @ApiModelProperty(value = "文件大小")
-    private String fileSize;
+    private long fileSize;
 
     @ApiModelProperty(value = "下载路径")
     private String url;

src/main/java/com/om/entity/vo/UserAddVO.java

@@ -15,6 +15,8 @@ public class UserAddVO extends User {
     @ApiModelProperty("页脚数")
     Integer pageIndex;
 
+    @ApiModelProperty("vcisn")
+    public String vciSn;
 
 
 }

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

@@ -90,7 +90,10 @@ public class BrushFileServiceImpl extends ServiceImpl<BrushFileMapper, BrushFile
                 if (BeanUtil.isEmpty(brushDescription)){
                     throw new BadReqException("该版本描述不存在");
                 }
+                appBrushFileVO.setFileSize((long) (Double.valueOf(brushFile.getFileSize())*1024*1024));
                 appBrushFileVO.setDescription(brushDescription.getDescription());
+                appBrushFileVO.setFileName(brushFile.getBrushFileName());
+                appBrushFileVO.setVersion(brushFile.getBrushFileName());
                 // appBrushFileVO.setUrl(obsUtil.getUploadUrl(brushFile.getBrushFileName(),));
                 appBrushFileVO.setCreateTime(brushFile.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
                 brushFileVOList.add(appBrushFileVO);

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

@@ -127,7 +127,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         if (BeanUtil.isEmpty(diagnosisVersionInfo)) {
             throw new BadReqException("该诊断程序不存在");
         }
-        String uploadUrl = obsUtil.getUploadUrl(diagnosisVersionInfo.getFileName(), diagnosisVersionInfo.getSavePath());
+        String uploadUrl = obsUtil.getUploadUrl(diagnosisVersionInfo.getFileName(), "program");
         return Result.ok(uploadUrl);
     }
 
@@ -334,11 +334,16 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         for (AppBrandInfo vehicleDates : brandInfo) {
             String version = vehicleDates.getVersion();
 
-            DiagnosisVersionInfo diagnosisVersionInfo = this.lambdaQuery()
+            List<DiagnosisVersionInfo> diagnosisVersionInfos = this.lambdaQuery()
                     .eq(DiagnosisVersionInfo::getBrandCode, vehicleDates.getBrandCode())
                     .apply("CONCAT(',', client_number, ',') LIKE {0}", "%,"+clientNum+",%")
                     .gt(DiagnosisVersionInfo::getVersion, version)
-                    .one();
+                    .orderByDesc(DiagnosisVersionInfo::getVersion)
+                    .list();
+            if (diagnosisVersionInfos.isEmpty()){
+                return Result.fail("未获取到数据").result(ResultCode.NO_DATA);
+            }
+            DiagnosisVersionInfo diagnosisVersionInfo = diagnosisVersionInfos.get(0);
             if (BeanUtil.isEmpty(diagnosisVersionInfo)) {
                 return Result.fail("未获取到数据").result(ResultCode.NO_DATA);
             }

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

@@ -186,7 +186,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return Result.ok(userLoginVO).message("账号尚未激活").result(ResultCode.USER_NO_ACTIVATE);
         }
         //  绑定 客户端编号 和 设备 序列号  ( 判断type是登录（0）还是激活（1） )
-        if (!user.getDeviceSn().equals(dto.getDeviceSn())){
+        if (!user.getDeviceSn().equals(dto.getDeviceSn())) {
             return Result.ok(userLoginVO).message("账号尚未激活").result(ResultCode.USER_NO_ACTIVATE);
         }
 
@@ -212,7 +212,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         addUser.setPassword(password);
         Integer distributorId = user.getDistributorId();
         //根据id查询维修厂
-        if(user.getDistributorId() != null){
+        if (user.getDistributorId() != null) {
             Distributor distributor = distributorService.getById(distributorId);
             if (BeanUtil.isEmpty(distributor)) {
                 throw new BadReqException("该维修厂不存在");
@@ -230,7 +230,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             deviceService.save(device);
         }
         this.save(addUser);
-
+        if (StringUtils.isNotBlank(user.getVciSn())) {
+            UserVci userVci = new UserVci();
+            //根据vciSn查询
+            VciInfo vciInfo = vciInfoService.lambdaQuery()
+                    .eq(VciInfo::getVciNum, user.getVciSn())
+                    .one();
+            if (vciInfo == null) {
+                throw new BadReqException("该VCI设备不存在");
+            }
+            userVci.setVciInfoId(vciInfo.getId());
+            userVci.setUserId(addUser.getId());
+            userVciService.save(userVci);
+        }
         return Result.ok();
     }
 
@@ -348,16 +360,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User userById = getById(userId);
         String password = user.getPassword();
         BeanUtil.copyProperties(user, userById);
-        //密码加密
-        try {
-            password = AesUtil.Encrypt(password);
-        } catch (Exception e) {
-            throw new BizException("密码加密出错", ResultCode.PASSWORD_ENCRYPT_ERROR);
-        }
-        if (!password.equals(userById.getPassword())) {
-            userById.setPassword(password);
+        if (!password.equals(userById.getPassword())){
+            //密码加密
+            try {
+                password = AesUtil.Encrypt(password);
+            } catch (Exception e) {
+                throw new BizException("密码加密出错", ResultCode.PASSWORD_ENCRYPT_ERROR);
+            }
+            if (!password.equals(userById.getPassword())) {
+                userById.setPassword(password);
+            }
+
         }
 
+
         Integer distributorId = userById.getDistributorId();
         //根据id查询维修厂
         Distributor distributor = distributorService.getById(distributorId);
@@ -382,7 +398,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Integer userId = guidDTO.getUserId();
         String username = dto.getUsername();
         User user = this.lambdaQuery()
-                .eq(User::getUsername,username)
+                .eq(User::getUsername, username)
                 .one();
         if (user == null) {
             return Result.error().message("用户不存在").result(ResultCode.USER_NO_EXIST);
@@ -528,7 +544,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
 
 
-
         return null;
     }
 }

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

@@ -180,7 +180,7 @@ public class AesUtil {
         System.out.println("加密的密码是："+password);
 
         //密码解密
-        String decrypt = Decrypt("gR/KtOhHYSKVYZhVaBurmjR/MUyEMMwYdTisRETiwOk=");
+        String decrypt = Decrypt("v6MnUQze567c7vJWwS/yt4XlmgEE9yE/SGZfZpWujSg=");
         System.out.println(decrypt);
     }