Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
FCL
2026-01-12 15:26:36 +08:00

View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.qms.resource.clientManage.controller.admin; 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.VersionManagementPageReqVO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementRespVO; import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementRespVO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementSaveReqVO; import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementSaveReqVO;
@@ -55,6 +57,9 @@ public class VersionManagementController extends AbstractFileUploadController im
@Resource @Resource
private VersionManagementService systemVersionManagementService; private VersionManagementService systemVersionManagementService;
@Resource
private FileApi fileApi;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建客户端版本管理") @Operation(summary = "创建客户端版本管理")
@PreAuthorize("@ss.hasPermission('qms:version-management:create')") @PreAuthorize("@ss.hasPermission('qms:version-management:create')")
@@ -138,6 +143,14 @@ public class VersionManagementController extends AbstractFileUploadController im
String log = ""; String log = "";
if (pageResult.getList().size() != 0) { if (pageResult.getList().size() != 0) {
VersionManagementDO versionManagementDO = pageResult.getList().get(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(); version = versionManagementDO.getCurrentVersion();
minVersion = versionManagementDO.getMinimumVersion(); minVersion = versionManagementDO.getMinimumVersion();
url = versionManagementDO.getDownloadUrl(); url = versionManagementDO.getDownloadUrl();
@@ -165,6 +178,13 @@ public class VersionManagementController extends AbstractFileUploadController im
return CommonResult.error(400, "没有可更新版本"); return CommonResult.error(400, "没有可更新版本");
} }
VersionManagementDO versionManagementDO = pageResult.getList().get(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());
}
return success(BeanUtils.toBean(versionManagementDO, VersionManagementRespVO.class)); return success(BeanUtils.toBean(versionManagementDO, VersionManagementRespVO.class));
} }