zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:app版本管理细节调整

Browse Source
This commit is contained in:
FCL
2025-12-18 10:51:21 +08:00
parent 24f4e011be
commit 8977be538d
9 changed files with 187 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/VersionManagementConst.java Normal file
View File

@@ -0,0 +1,8 @@
package com.zt.plat.module.qms.resource.clientManage;
public class VersionManagementConst {
public static final String UPDATE_TYPE_WAITING = "0"; //未发布
public static final String PUBLISH_FLAG_PUBLISH = "1"; //已发布
public static final String PUBLISH_FLAG_OFFLINE = "2"; //下线
}

30
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/VersionManagementController.java
View File

@@ -56,14 +56,14 @@ public class VersionManagementController extends AbstractFileUploadController im
@Operation(summary = "创建客户端版本管理")
@PreAuthorize("@ss.hasPermission('qms:version-management:create')")
public CommonResult<VersionManagementRespVO> createSystemVersionManagement(@Valid @RequestBody VersionManagementSaveReqVO createReqVO) {
return success(systemVersionManagementService.createSystemVersionManagement(createReqVO));
return success(systemVersionManagementService.createVersionManagement(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新客户端版本管理")
@PreAuthorize("@ss.hasPermission('qms:version-management:update')")
public CommonResult<Boolean> updateSystemVersionManagement(@Valid @RequestBody VersionManagementSaveReqVO updateReqVO) {
systemVersionManagementService.updateSystemVersionManagement(updateReqVO);
systemVersionManagementService.updateVersionManagement(updateReqVO);
return success(true);
}
@@ -72,7 +72,7 @@ public class VersionManagementController extends AbstractFileUploadController im
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:version-management:delete')")
public CommonResult<Boolean> deleteSystemVersionManagement(@RequestParam("id") Long id) {
systemVersionManagementService.deleteSystemVersionManagement(id);
systemVersionManagementService.deleteVersionManagement(id);
return success(true);
}
@@ -90,7 +90,7 @@ public class VersionManagementController extends AbstractFileUploadController im
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:version-management:query')")
public CommonResult<VersionManagementRespVO> getSystemVersionManagement(@RequestParam("id") Long id) {
VersionManagementDO systemVersionManagement = systemVersionManagementService.getSystemVersionManagement(id);
VersionManagementDO systemVersionManagement = systemVersionManagementService.getVersionManagement(id);
return success(BeanUtils.toBean(systemVersionManagement, VersionManagementRespVO.class));
}
@@ -98,7 +98,7 @@ public class VersionManagementController extends AbstractFileUploadController im
@Operation(summary = "获得客户端版本管理分页")
@PreAuthorize("@ss.hasPermission('qms:version-management:query')")
public CommonResult<PageResult<VersionManagementRespVO>> getSystemVersionManagementPage(@Valid VersionManagementPageReqVO pageReqVO) {
PageResult<VersionManagementDO> pageResult = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO);
PageResult<VersionManagementDO> pageResult = systemVersionManagementService.getVersionManagementPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, VersionManagementRespVO.class));
}
@@ -109,7 +109,7 @@ public class VersionManagementController extends AbstractFileUploadController im
public void exportSystemVersionManagementExcel(@Valid VersionManagementPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<VersionManagementDO> list = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO).getList();
List<VersionManagementDO> list = systemVersionManagementService.getVersionManagementPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "客户端版本管理.xls", "数据", VersionManagementRespVO.class,
BeanUtils.toBean(list, VersionManagementRespVO.class));
@@ -118,7 +118,7 @@ public class VersionManagementController extends AbstractFileUploadController im
@GetMapping("/checkUpdate")
@Operation(summary = "根据更新平台和安装包类型获取最新客户端版本管理信息")
public CommonResult<PageResult<VersionManagementRespVO>> checkUpdate(@Valid VersionManagementPageReqVO pageReqVO) {
public CommonResult<VersionManagementRespVO> checkUpdate(@Valid VersionManagementPageReqVO pageReqVO) {
if (pageReqVO.getApplicationCode() == null ) {
return CommonResult.error(400, "客户端编号不能为空");
@@ -126,13 +126,17 @@ public class VersionManagementController extends AbstractFileUploadController im
if (pageReqVO.getUpdatePlatform() == null ) {
return CommonResult.error(400, "更新平台不能为空");
}
PageResult<VersionManagementDO> pageResult = systemVersionManagementService.getLts(pageReqVO);
return success(BeanUtils.toBean(pageResult, VersionManagementRespVO.class));
PageResult<VersionManagementDO> pageResult = systemVersionManagementService.getList(pageReqVO);
if (pageResult.getList().size() == 0) {
return CommonResult.error(400, "没有可更新版本");
}
VersionManagementDO versionManagementDO = pageResult.getList().get(0);
return success(BeanUtils.toBean(versionManagementDO, VersionManagementRespVO.class));
}
@GetMapping("/publish")
CommonResult<Boolean> publish(@RequestParam("id") Long id) {
systemVersionManagementService.publish(id);
return success(true);
@GetMapping("/executePublish")
CommonResult<String> executePublish(@RequestParam("id") Long id) {
systemVersionManagementService.executePublish(id);
return success("发布成功");
}
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/uploadFileVo.java → zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/UploadFileVo.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
@Schema(description = "附件实例")
@Data
public class uploadFileVo {
public class UploadFileVo {
private String id;
private String url;

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementSaveReqVO.java
View File

@@ -65,11 +65,10 @@ public class VersionManagementSaveReqVO {
@Schema(description = "备注")
private String remark;
@Schema(description = "上传文件列表")
private List<uploadFileVo> files;
@Schema(description = "上传文件Uid")
private String downloadId;
//==========扩展属性===============
@Schema(description = "上传文件列表")
private List<UploadFileVo> files;
}

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/VersionManagementDO.java
View File

@@ -111,9 +111,6 @@ public class VersionManagementDO extends BusinessBaseDO {
@TableField("RMK")
private String remark;
@TableField("CREATOR")
private String creator;
@TableField("DL_ID")
private String downloadId;

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/VersionManagementMapper.java
View File

@@ -43,18 +43,4 @@ public interface VersionManagementMapper extends BaseMapperX<VersionManagementDO
// .last("LIMIT 1")
);
}
default List<VersionManagementDO> selectBySameCode(Long id) {
// 先根据id查询出目标记录的custDeviceCode
VersionManagementDO target = selectById(id);
if (target == null) {
return Collections.emptyList();
}
// 查询相同custDeviceCode的所有记录
return selectList(new LambdaQueryWrapperX<VersionManagementDO>()
.eq(VersionManagementDO::getApplicationCode, target.getApplicationCode())
.eq(VersionManagementDO::getPublishFlag, 1)
.orderByDesc(VersionManagementDO::getCreateTime));
}
}

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/VersionManagementService.java
View File

@@ -22,21 +22,21 @@ public interface VersionManagementService {
* @param createReqVO 创建信息
* @return 编号
*/
VersionManagementRespVO createSystemVersionManagement(@Valid VersionManagementSaveReqVO createReqVO);
VersionManagementRespVO createVersionManagement(@Valid VersionManagementSaveReqVO createReqVO);
/**
* 更新客户端版本管理
*
* @param updateReqVO 更新信息
*/
void updateSystemVersionManagement(@Valid VersionManagementSaveReqVO updateReqVO);
void updateVersionManagement(@Valid VersionManagementSaveReqVO updateReqVO);
/**
* 删除客户端版本管理
*
* @param id 编号
*/
void deleteSystemVersionManagement(Long id);
void deleteVersionManagement(Long id);
/**
* 批量删除客户端版本管理
@@ -51,7 +51,7 @@ public interface VersionManagementService {
* @param id 编号
* @return 客户端版本管理
*/
VersionManagementDO getSystemVersionManagement(Long id);
VersionManagementDO getVersionManagement(Long id);
/**
* 获得客户端版本管理分页
@@ -59,7 +59,7 @@ public interface VersionManagementService {
* @param pageReqVO 分页查询
* @return 客户端版本管理分页
*/
PageResult<VersionManagementDO> getSystemVersionManagementPage(VersionManagementPageReqVO pageReqVO);
PageResult<VersionManagementDO> getVersionManagementPage(VersionManagementPageReqVO pageReqVO);
/**
@@ -68,11 +68,11 @@ public interface VersionManagementService {
* @param pageReqVO 分页查询
* @return 客户端版本管理分页
*/
PageResult<VersionManagementDO> getLts(VersionManagementPageReqVO pageReqVO);
PageResult<VersionManagementDO> getList(VersionManagementPageReqVO pageReqVO);
/**
* 版本发布
* @param id
*/
void publish (Long id);
void executePublish(Long id);
}

151
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/VersionManagementServiceImpl.java Normal file
View File

File diff suppressed because it is too large Load Diff

150
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/versionManagementServiceImpl.java
View File

File diff suppressed because it is too large Load Diff