Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.zt.plat.module.qms.resource.clientManage.controller.admin;
|
||||
|
||||
import com.zt.plat.module.infra.api.file.FileApi;
|
||||
import com.zt.plat.module.infra.api.file.dto.FileRespDTO;
|
||||
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementRespVO;
|
||||
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementSaveReqVO;
|
||||
@@ -54,6 +56,9 @@ public class VersionManagementController extends AbstractFileUploadController im
|
||||
|
||||
@Resource
|
||||
private VersionManagementService systemVersionManagementService;
|
||||
|
||||
@Resource
|
||||
private FileApi fileApi;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建客户端版本管理")
|
||||
@@ -138,6 +143,14 @@ public class VersionManagementController extends AbstractFileUploadController im
|
||||
String log = "";
|
||||
if (pageResult.getList().size() != 0) {
|
||||
VersionManagementDO versionManagementDO = pageResult.getList().get(0);
|
||||
//处理文件下载url
|
||||
Long fileId = Long.parseLong(versionManagementDO.getDownloadId());
|
||||
CommonResult<FileRespDTO> fileRet = fileApi.getFileInfo(fileId);
|
||||
FileRespDTO file = fileRet.getData();
|
||||
if(fileRet.isSuccess() && file != null) {
|
||||
versionManagementDO.setDownloadUrl(file.getUrl());
|
||||
}
|
||||
|
||||
version = versionManagementDO.getCurrentVersion();
|
||||
minVersion = versionManagementDO.getMinimumVersion();
|
||||
url = versionManagementDO.getDownloadUrl();
|
||||
@@ -165,6 +178,13 @@ public class VersionManagementController extends AbstractFileUploadController im
|
||||
return CommonResult.error(400, "没有可更新版本");
|
||||
}
|
||||
VersionManagementDO versionManagementDO = pageResult.getList().get(0);
|
||||
//处理文件下载url
|
||||
Long fileId = Long.parseLong(versionManagementDO.getDownloadId());
|
||||
CommonResult<FileRespDTO> fileRet = fileApi.getFileInfo(fileId);
|
||||
FileRespDTO file = fileRet.getData();
|
||||
if(fileRet.isSuccess() && file != null) {
|
||||
versionManagementDO.setDownloadUrl(file.getUrl());
|
||||
}
|
||||
|
||||
return success(BeanUtils.toBean(versionManagementDO, VersionManagementRespVO.class));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user