BUG

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

@@ -8,11 +8,14 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class SDKData {
     @ApiModelProperty(value = "文件大小")
-    private String fileSize;
+    private long fileSize;
 
     @ApiModelProperty(value = "SDK版本")
     private String version;
 
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
     @ApiModelProperty(value = "版本描述")
     private String description;
 

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

@@ -8,11 +8,14 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class appData {
     @ApiModelProperty(value = "文件大小")
-    private String fileSize;
+    private long fileSize;
 
     @ApiModelProperty(value = "app版本")
     private String version;
 
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
     @ApiModelProperty(value = "版本描述")
     private String description;
 

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

@@ -87,11 +87,13 @@ public class BrushFileServiceImpl extends ServiceImpl<BrushFileMapper, BrushFile
                         .eq(BrushDescription::getBrushId, brushFile.getId())
                         .eq(BrushDescription::getLanguage, language)
                         .one();
-                if (BeanUtil.isEmpty(brushDescription)){
-                    throw new BadReqException("该版本描述不存在");
+                if (!BeanUtil.isEmpty(brushDescription)){
+                    appBrushFileVO.setDescription(brushDescription.getDescription());
+                }else {
+                    appBrushFileVO.setDescription("");
                 }
                 appBrushFileVO.setFileSize((long) (Double.valueOf(brushFile.getFileSize())*1024*1024));
-                appBrushFileVO.setDescription(brushDescription.getDescription());
+
                 appBrushFileVO.setFileName(brushFile.getBrushFileName());
                 int lastIndexOf = brushFile.getBrushFileName().lastIndexOf('.');
                 appBrushFileVO.setVersion(brushFile.getBrushFileName());

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -91,6 +92,8 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         info.setSavePath(diagnosisVersionVO.getSavePath());
         info.setFileName(diagnosisVersionVO.getFileName());
         info.setLifecycle(0);
+        info.setCreateTime(LocalDateTime.now());
+        info.setUpdateTime(LocalDateTime.now());
         //保存
         this.save(info);
 
@@ -354,18 +357,20 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             if (BeanUtil.isEmpty(brand)) {
                 throw new BadReqException("品牌不存在");
             }
-
+            VehicleDates vehicleDates1 = BeanUtil.copyProperties(diagnosisVersionInfo, VehicleDates.class);
             //根据语言获取对应描述
             DiagnosisVersionDescribe diagnosisVersionDescribe = describeService.lambdaQuery()
                     .eq(DiagnosisVersionDescribe::getLanguage, language)
                     .eq(DiagnosisVersionDescribe::getDiagnosisId, diagnosisVersionInfo.getId())
                     .one();
-            if (BeanUtil.isEmpty(diagnosisVersionDescribe)) {
-                throw new BadReqException("该描述不存在");
+            if (!BeanUtil.isEmpty(diagnosisVersionDescribe)) {
+                vehicleDates1.setDescription(diagnosisVersionDescribe.getDescription());
+            }else {
+                vehicleDates1.setDescription("");
             }
             //获取下载链接
             String uploadUrl = obsUtil.getUploadUrl(diagnosisVersionInfo.getFileName(), "program");
-            VehicleDates vehicleDates1 = BeanUtil.copyProperties(diagnosisVersionInfo, VehicleDates.class);
+
             vehicleDates1.setUrl(uploadUrl);
             vehicleDates1.setVersion(diagnosisVersionInfo.getVersion());
             double v = Double.valueOf(diagnosisVersionInfo.getDiagnosisFileSize()) * 1024 * 1024;
@@ -373,7 +378,6 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             vehicleDates1.setFileSize((long) v);
             vehicleDates1.setBrandCn(brand.getBrandCn());
             vehicleDates1.setBrandEn(brand.getBrandEn());
-            vehicleDates1.setDescription(diagnosisVersionDescribe.getDescription());
             vehicleDates1.setFileName(diagnosisVersionInfo.getFileName());
             vehicleDates1.setPath(diagnosisVersionInfo.getSavePath());
             vehicleDates1.setCreateTime(diagnosisVersionInfo.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.om.entity.po.*;
 import com.om.entity.vo.SDKInfoVO;
+import com.om.mapper.PcbClientsMapper;
+import com.om.mapper.PcbVersionInfoMapper;
 import com.om.mapper.SdkVersionInfoMapper;
 import com.om.service.ISdkClientsService;
 import com.om.service.ISdkVersionDescribeService;
@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -37,7 +40,10 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
     
     @Resource
     private ISdkVersionDescribeService describeService;
-
+    @Autowired
+    private PcbClientsMapper pcbClientsMapper;
+    @Autowired
+    private PcbVersionInfoMapper pcbVersionInfoMapper;
 
 
     @Override
@@ -152,9 +158,15 @@ public class SdkVersionInfoServiceImpl extends ServiceImpl<SdkVersionInfoMapper,
     public Result add(SDKInfoVO sdkInfoVO) {
         SdkVersionInfo sdkVersionInfo = new SdkVersionInfo();
         BeanUtil.copyProperties(sdkInfoVO,sdkVersionInfo);
+
+        LambdaQueryWrapper<PcbVersionInfo> pcbVersionInforWrapper = new LambdaQueryWrapper<>();
+        pcbVersionInforWrapper.eq(PcbVersionInfo::getVersionNum,sdkVersionInfo.getPcbVersion());
+        PcbVersionInfo pcbVersionInfo = pcbVersionInfoMapper.selectOne(pcbVersionInforWrapper);
+        if (!BeanUtil.isEmpty(pcbVersionInfo)){
+            sdkVersionInfo.setPcbId(pcbVersionInfo.getId());
+        }
         this.save(sdkVersionInfo);
         Integer sdkInfoId = sdkVersionInfo.getId();
-
         //SdkClient表关联
         for (int i = 0; i < sdkInfoVO.getClientNum().length; i++) {