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

fix：版本管理模块文件名修改,字段修改,版本查询条件修改

Browse Source
This commit is contained in:
禁止呵呵
2025-12-05 17:23:41 +08:00
parent 9cf4af15c2
commit c7f3bc0a46
11 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementPageReqVO.java → zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementPageReqVO.java
View File

@@ -10,10 +10,10 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Schema(description = "管理后台 - 客户端版本管理分页 Request VO")
@Data
public class SystemVersionManagementPageReqVO extends PageParam {
public class VersionManagementPageReqVO extends PageParam {
@Schema(description = "客户端id", example = "赵六")
private String custDeviceId;
@Schema(description = "客户端code", example = "赵六")
private String custDeviceCode;
@Schema(description = "客户端名称", example = "赵六")
private String custDeviceName;

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementRespVO.java → zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementRespVO.java
View File

@@ -11,16 +11,16 @@ import com.zt.plat.framework.excel.core.convert.DictConvert;
@Schema(description = "管理后台 - 客户端版本管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class SystemVersionManagementRespVO {
public class VersionManagementRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18365")
@ExcelProperty("主键")
private Long id;
@Schema(description = "客户端id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
@ExcelProperty(value = "客户端id", converter = DictConvert.class)
@Schema(description = "客户端code", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
@ExcelProperty(value = "客户端code", converter = DictConvert.class)
@DictFormat("T_SYS_VER_MNGT_CUST_DEV") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private String custDeviceId;
private String custDeviceCode;
@Schema(description = "客户端名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty(value = "客户端名称", converter = DictConvert.class)

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

@@ -8,21 +8,21 @@ import java.util.List;
@Schema(description = "管理后台 - 客户端版本管理新增/修改 Request VO")
@Data
public class SystemVersionManagementSaveReqVO {
public class VersionManagementSaveReqVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18365")
private Long id;
// @Schema(description = "客户端id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
// @NotEmpty(message = "客户端id不能为空")
// private String custDeviceId;
// @Schema(description = "客户端code", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
// @NotEmpty(message = "客户端code不能为空")
// private String custDeviceCode;
// @Schema(description = "客户端名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
// @NotEmpty(message = "客户端名称不能为空")
// private String custDeviceName;
@Schema(description = "客户端id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
@Schema(description = "客户端code", requiredMode = Schema.RequiredMode.REQUIRED, example = "20524")
@NotEmpty(message = "客户端名称不能为空")
private String custDeviceId;
private String custDeviceCode;
@Schema(description = "客户端名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "客户端名称不能为空")

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

@@ -8,8 +8,8 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
*
* @author 后台管理
*/
@TableName("t_sys_ver_mngt")
@KeySequence("t_sys_ver_mngt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@TableName("t_ver_mngt")
@KeySequence("t_ver_mngt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@@ -19,7 +19,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
/**
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
*/
public class SystemVersionManagementDO extends BusinessBaseDO {
public class VersionManagementDO extends BusinessBaseDO {
@@ -29,12 +29,12 @@ public class SystemVersionManagementDO extends BusinessBaseDO {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 客户端id
* 客户端code
*
* 枚举 {@link TODO T_SYS_VER_MNGT_CUST_DEV 对应的类}
*/
@TableField("CUST_DEV_ID")
private String custDeviceId;
@TableField("CUST_DEV_CD")
private String custDeviceCode;
/**
* 客户端名称
*

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

@@ -1,60 +0,0 @@
package com.zt.plat.module.qms.resource.clientManage.dal.mapper;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.SystemVersionManagementDO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.SystemVersionManagementPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collections;
import java.util.List;
/**
* 客户端版本管理 Mapper
*
* @author 后台管理
*/
@Mapper
public interface SystemVersionManagementMapper extends BaseMapperX<SystemVersionManagementDO> {
default PageResult<SystemVersionManagementDO> selectPage(SystemVersionManagementPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<SystemVersionManagementDO>()
.eqIfPresent(SystemVersionManagementDO::getCustDeviceId, reqVO.getCustDeviceId())
.eqIfPresent(SystemVersionManagementDO::getCustDeviceName, reqVO.getCustDeviceName())
.eqIfPresent(SystemVersionManagementDO::getUpdateTitle, reqVO.getUpdateTitle())
.eqIfPresent(SystemVersionManagementDO::getUpdateContent, reqVO.getUpdateContent())
.eqIfPresent(SystemVersionManagementDO::getUpdatePlatform, reqVO.getUpdatePlatform())
.eqIfPresent(SystemVersionManagementDO::getIssuanceFlag, reqVO.getIssuanceFlag())
.eqIfPresent(SystemVersionManagementDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.eqIfPresent(SystemVersionManagementDO::getCreator, reqVO.getCreator())
.betweenIfPresent(SystemVersionManagementDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(SystemVersionManagementDO::getId));
}
default PageResult<SystemVersionManagementDO> selectLts(SystemVersionManagementPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<SystemVersionManagementDO>()
.eqIfPresent(SystemVersionManagementDO::getUpdatePlatform, reqVO.getUpdatePlatform())
.eqIfPresent(SystemVersionManagementDO::getUpdateType, reqVO.getUpdateType())
.eqIfPresent(SystemVersionManagementDO::getCustDeviceId, reqVO.getCustDeviceId())
.eq(SystemVersionManagementDO::getIssuanceFlag,1)
.orderByDesc(SystemVersionManagementDO::getCreateTime)
// .last("LIMIT 1")
);
}
default List<SystemVersionManagementDO> selectBySameCustDeviceId(Long id) {
// 先根据id查询出目标记录的custDeviceId
SystemVersionManagementDO target = selectById(id);
if (target == null) {
return Collections.emptyList();
}
// 查询相同custDeviceId的所有记录
return selectList(new LambdaQueryWrapperX<SystemVersionManagementDO>()
.eq(SystemVersionManagementDO::getCustDeviceId, target.getCustDeviceId())
.eq(SystemVersionManagementDO::getIssuanceFlag, 1)
.orderByDesc(SystemVersionManagementDO::getCreateTime));
}
}

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

@@ -0,0 +1,60 @@
package com.zt.plat.module.qms.resource.clientManage.dal.mapper;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.VersionManagementDO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.VersionManagementPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collections;
import java.util.List;
/**
* 客户端版本管理 Mapper
*
* @author 后台管理
*/
@Mapper
public interface VersionManagementMapper extends BaseMapperX<VersionManagementDO> {
default PageResult<VersionManagementDO> selectPage(VersionManagementPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<VersionManagementDO>()
.eqIfPresent(VersionManagementDO::getCustDeviceCode, reqVO.getCustDeviceCode())
.eqIfPresent(VersionManagementDO::getCustDeviceName, reqVO.getCustDeviceName())
.eqIfPresent(VersionManagementDO::getUpdateTitle, reqVO.getUpdateTitle())
.eqIfPresent(VersionManagementDO::getUpdateContent, reqVO.getUpdateContent())
.eqIfPresent(VersionManagementDO::getUpdatePlatform, reqVO.getUpdatePlatform())
.eqIfPresent(VersionManagementDO::getIssuanceFlag, reqVO.getIssuanceFlag())
.eqIfPresent(VersionManagementDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.eqIfPresent(VersionManagementDO::getCreator, reqVO.getCreator())
.betweenIfPresent(VersionManagementDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(VersionManagementDO::getId));
}
default PageResult<VersionManagementDO> selectLts(VersionManagementPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<VersionManagementDO>()
.eqIfPresent(VersionManagementDO::getUpdatePlatform, reqVO.getUpdatePlatform())
.eqIfPresent(VersionManagementDO::getUpdateType, reqVO.getUpdateType())
.eqIfPresent(VersionManagementDO::getCustDeviceCode, reqVO.getCustDeviceCode())
.eq(VersionManagementDO::getIssuanceFlag,1)
.orderByDesc(VersionManagementDO::getCreateTime)
// .last("LIMIT 1")
);
}
default List<VersionManagementDO> selectBySameCustDeviceCode(Long id) {
// 先根据id查询出目标记录的custDeviceCode
VersionManagementDO target = selectById(id);
if (target == null) {
return Collections.emptyList();
}
// 查询相同custDeviceCode的所有记录
return selectList(new LambdaQueryWrapperX<VersionManagementDO>()
.eq(VersionManagementDO::getCustDeviceCode, target.getCustDeviceCode())
.eq(VersionManagementDO::getIssuanceFlag, 1)
.orderByDesc(VersionManagementDO::getCreateTime));
}
}

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

@@ -2,11 +2,11 @@ package com.zt.plat.module.qms.resource.clientManage.service;
import java.util.*;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.SystemVersionManagementPageReqVO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.SystemVersionManagementRespVO;
import com.zt.plat.module.qms.resource.clientManage.controller.vo.SystemVersionManagementSaveReqVO;
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;
import jakarta.validation.*;
import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.SystemVersionManagementDO;
import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.VersionManagementDO;
import com.zt.plat.framework.common.pojo.PageResult;
/**
@@ -14,7 +14,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
*
* @author 后台管理
*/
public interface SystemVersionManagementService {
public interface VersionManagementService {
/**
* 创建客户端版本管理
@@ -22,14 +22,14 @@ public interface SystemVersionManagementService {
* @param createReqVO 创建信息
* @return 编号
*/
SystemVersionManagementRespVO createSystemVersionManagement(@Valid SystemVersionManagementSaveReqVO createReqVO);
VersionManagementRespVO createSystemVersionManagement(@Valid VersionManagementSaveReqVO createReqVO);
/**
* 更新客户端版本管理
*
* @param updateReqVO 更新信息
*/
void updateSystemVersionManagement(@Valid SystemVersionManagementSaveReqVO updateReqVO);
void updateSystemVersionManagement(@Valid VersionManagementSaveReqVO updateReqVO);
/**
* 删除客户端版本管理
@@ -51,7 +51,7 @@ public interface SystemVersionManagementService {
* @param id 编号
* @return 客户端版本管理
*/
SystemVersionManagementDO getSystemVersionManagement(Long id);
VersionManagementDO getSystemVersionManagement(Long id);
/**
* 获得客户端版本管理分页
@@ -59,7 +59,7 @@ public interface SystemVersionManagementService {
* @param pageReqVO 分页查询
* @return 客户端版本管理分页
*/
PageResult<SystemVersionManagementDO> getSystemVersionManagementPage(SystemVersionManagementPageReqVO pageReqVO);
PageResult<VersionManagementDO> getSystemVersionManagementPage(VersionManagementPageReqVO pageReqVO);
/**
@@ -68,7 +68,7 @@ public interface SystemVersionManagementService {
* @param pageReqVO 分页查询
* @return 客户端版本管理分页
*/
PageResult<SystemVersionManagementDO> getLts(SystemVersionManagementPageReqVO pageReqVO);
PageResult<VersionManagementDO> getLts(VersionManagementPageReqVO pageReqVO);
/**
* 版本发布

45
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementServiceImpl.java → 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

2
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/SystemVersionManagementMapper.xml → zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/VersionManagementMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.plat.module.qms.resource.clientManage.dal.mapper.SystemVersionManagementMapper">
<mapper namespace="com.zt.plat.module.qms.resource.clientManage.dal.mapper.VersionManagementMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。