From c7f3bc0a4666c42852d468da9dd1dbf1265df92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=91=B5=E5=91=B5?= Date: Fri, 5 Dec 2025 17:23:41 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=89=88=E6=9C=AC=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9,=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qms-server/src/main/resources/application.yml | 6 +- ....java => VersionManagementController.java} | 55 ++++++++--------- ...O.java => VersionManagementPageReqVO.java} | 6 +- ...spVO.java => VersionManagementRespVO.java} | 8 +-- ...O.java => VersionManagementSaveReqVO.java} | 12 ++-- ...gementDO.java => VersionManagementDO.java} | 12 ++-- .../mapper/SystemVersionManagementMapper.java | 60 ------------------- .../dal/mapper/VersionManagementMapper.java | 60 +++++++++++++++++++ ...ice.java => VersionManagementService.java} | 20 +++---- ...java => versionManagementServiceImpl.java} | 45 +++++++------- ...Mapper.xml => VersionManagementMapper.xml} | 2 +- 11 files changed, 143 insertions(+), 143 deletions(-) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/{SystemVersionManagementController.java => VersionManagementController.java} (66%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/{SystemVersionManagementPageReqVO.java => VersionManagementPageReqVO.java} (88%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/{SystemVersionManagementRespVO.java => VersionManagementRespVO.java} (93%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/{SystemVersionManagementSaveReqVO.java => VersionManagementSaveReqVO.java} (86%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/{SystemVersionManagementDO.java => VersionManagementDO.java} (88%) delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/SystemVersionManagementMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/VersionManagementMapper.java rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/{SystemVersionManagementService.java => VersionManagementService.java} (68%) rename zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/{SystemVersionManagementServiceImpl.java => versionManagementServiceImpl.java} (69%) rename zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/{SystemVersionManagementMapper.xml => VersionManagementMapper.xml} (93%) diff --git a/qms-server/src/main/resources/application.yml b/qms-server/src/main/resources/application.yml index 6a4ab2a..2c1cdb6 100644 --- a/qms-server/src/main/resources/application.yml +++ b/qms-server/src/main/resources/application.yml @@ -119,5 +119,9 @@ zt: version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true - + ignore-urls: + - /admin-api/qms/system-version-management/get-by-platform/** + security: + permit-all-urls: + - /admin-api/qms/system-version-management/get-by-platform/** debug: false diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/SystemVersionManagementController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/VersionManagementController.java similarity index 66% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/SystemVersionManagementController.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/VersionManagementController.java index 8f56c6a..3475f41 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/SystemVersionManagementController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/admin/VersionManagementController.java @@ -1,8 +1,8 @@ package com.zt.plat.module.qms.resource.clientManage.controller.admin; -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 org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,37 +32,37 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.SystemVersionManagementDO; -import com.zt.plat.module.qms.resource.clientManage.service.SystemVersionManagementService; +import com.zt.plat.module.qms.resource.clientManage.dal.dataobject.VersionManagementDO; +import com.zt.plat.module.qms.resource.clientManage.service.VersionManagementService; @Tag(name = "管理后台 - 客户端版本管理") @RestController @RequestMapping("/qms/system-version-management") @Validated @FileUploadController(source = "qms.systemversionmanagement") -public class SystemVersionManagementController extends AbstractFileUploadController implements BusinessControllerMarker{ +public class VersionManagementController extends AbstractFileUploadController implements BusinessControllerMarker{ static { - FileUploadController annotation = SystemVersionManagementController.class.getAnnotation(FileUploadController.class); + FileUploadController annotation = VersionManagementController.class.getAnnotation(FileUploadController.class); if (annotation != null) { setFileUploadInfo(annotation); } } @Resource - private SystemVersionManagementService systemVersionManagementService; + private VersionManagementService systemVersionManagementService; @PostMapping("/create") @Operation(summary = "创建客户端版本管理") @PreAuthorize("@ss.hasPermission('qms:system-version-management:create')") - public CommonResult createSystemVersionManagement(@Valid @RequestBody SystemVersionManagementSaveReqVO createReqVO) { + public CommonResult createSystemVersionManagement(@Valid @RequestBody VersionManagementSaveReqVO createReqVO) { return success(systemVersionManagementService.createSystemVersionManagement(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新客户端版本管理") @PreAuthorize("@ss.hasPermission('qms:system-version-management:update')") - public CommonResult updateSystemVersionManagement(@Valid @RequestBody SystemVersionManagementSaveReqVO updateReqVO) { + public CommonResult updateSystemVersionManagement(@Valid @RequestBody VersionManagementSaveReqVO updateReqVO) { systemVersionManagementService.updateSystemVersionManagement(updateReqVO); return success(true); } @@ -89,49 +89,46 @@ public class SystemVersionManagementController extends AbstractFileUploadControl @Operation(summary = "获得客户端版本管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('qms:system-version-management:query')") - public CommonResult getSystemVersionManagement(@RequestParam("id") Long id) { - SystemVersionManagementDO systemVersionManagement = systemVersionManagementService.getSystemVersionManagement(id); - return success(BeanUtils.toBean(systemVersionManagement, SystemVersionManagementRespVO.class)); + public CommonResult getSystemVersionManagement(@RequestParam("id") Long id) { + VersionManagementDO systemVersionManagement = systemVersionManagementService.getSystemVersionManagement(id); + return success(BeanUtils.toBean(systemVersionManagement, VersionManagementRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得客户端版本管理分页") @PreAuthorize("@ss.hasPermission('qms:system-version-management:query')") - public CommonResult> getSystemVersionManagementPage(@Valid SystemVersionManagementPageReqVO pageReqVO) { - PageResult pageResult = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, SystemVersionManagementRespVO.class)); + public CommonResult> getSystemVersionManagementPage(@Valid VersionManagementPageReqVO pageReqVO) { + PageResult pageResult = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, VersionManagementRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出客户端版本管理 Excel") @PreAuthorize("@ss.hasPermission('qms:system-version-management:export')") @ApiAccessLog(operateType = EXPORT) - public void exportSystemVersionManagementExcel(@Valid SystemVersionManagementPageReqVO pageReqVO, + public void exportSystemVersionManagementExcel(@Valid VersionManagementPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO).getList(); + List list = systemVersionManagementService.getSystemVersionManagementPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "客户端版本管理.xls", "数据", SystemVersionManagementRespVO.class, - BeanUtils.toBean(list, SystemVersionManagementRespVO.class)); + ExcelUtils.write(response, "客户端版本管理.xls", "数据", VersionManagementRespVO.class, + BeanUtils.toBean(list, VersionManagementRespVO.class)); } @GetMapping("/get-by-platform") @Operation(summary = "根据更新平台和安装包类型获取最新客户端版本管理信息") //@PreAuthorize("@ss.hasPermission('qms:system-version-management:query')") - public CommonResult> getSystemVersionManagementByPlatformAndType(@Valid SystemVersionManagementPageReqVO pageReqVO) { + public CommonResult> getSystemVersionManagementByPlatformAndType(@Valid VersionManagementPageReqVO pageReqVO) { - if (pageReqVO.getCustDeviceId() == null ) { - return CommonResult.error(400, "客户端编号"); + if (pageReqVO.getCustDeviceCode() == null ) { + return CommonResult.error(400, "客户端编号不能为空"); } if (pageReqVO.getUpdatePlatform() == null ) { - return CommonResult.error(400, "更新平台不能同时为空"); + return CommonResult.error(400, "更新平台不能为空"); } - if (pageReqVO.getUpdateType() == null) { - return CommonResult.error(400, "安装包类型不能同时为空"); - } - PageResult pageResult = systemVersionManagementService.getLts(pageReqVO); - return success(BeanUtils.toBean(pageResult, SystemVersionManagementRespVO.class)); + PageResult pageResult = systemVersionManagementService.getLts(pageReqVO); + return success(BeanUtils.toBean(pageResult, VersionManagementRespVO.class)); } @GetMapping("/publish") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementPageReqVO.java similarity index 88% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementPageReqVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementPageReqVO.java index c8fb26e..ddcefee 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementPageReqVO.java @@ -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; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementRespVO.java similarity index 93% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementRespVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementRespVO.java index 7a4d22f..9803bba 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementRespVO.java @@ -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) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementSaveReqVO.java similarity index 86% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementSaveReqVO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementSaveReqVO.java index e5ff4f1..681a421 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/SystemVersionManagementSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/controller/vo/VersionManagementSaveReqVO.java @@ -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 = "客户端名称不能为空") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/SystemVersionManagementDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/VersionManagementDO.java similarity index 88% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/SystemVersionManagementDO.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/VersionManagementDO.java index 288833d..833838c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/SystemVersionManagementDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/dataobject/VersionManagementDO.java @@ -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; /** * 客户端名称 * diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/SystemVersionManagementMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/SystemVersionManagementMapper.java deleted file mode 100644 index 0636952..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/SystemVersionManagementMapper.java +++ /dev/null @@ -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 { - - default PageResult selectPage(SystemVersionManagementPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .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 selectLts(SystemVersionManagementPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .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 selectBySameCustDeviceId(Long id) { - // 先根据id查询出目标记录的custDeviceId - SystemVersionManagementDO target = selectById(id); - if (target == null) { - return Collections.emptyList(); - } - - // 查询相同custDeviceId的所有记录 - return selectList(new LambdaQueryWrapperX() - .eq(SystemVersionManagementDO::getCustDeviceId, target.getCustDeviceId()) - .eq(SystemVersionManagementDO::getIssuanceFlag, 1) - .orderByDesc(SystemVersionManagementDO::getCreateTime)); - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/VersionManagementMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/VersionManagementMapper.java new file mode 100644 index 0000000..3cd4704 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/dal/mapper/VersionManagementMapper.java @@ -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 { + + default PageResult selectPage(VersionManagementPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .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 selectLts(VersionManagementPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .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 selectBySameCustDeviceCode(Long id) { + // 先根据id查询出目标记录的custDeviceCode + VersionManagementDO target = selectById(id); + if (target == null) { + return Collections.emptyList(); + } + + // 查询相同custDeviceCode的所有记录 + return selectList(new LambdaQueryWrapperX() + .eq(VersionManagementDO::getCustDeviceCode, target.getCustDeviceCode()) + .eq(VersionManagementDO::getIssuanceFlag, 1) + .orderByDesc(VersionManagementDO::getCreateTime)); + } +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/VersionManagementService.java similarity index 68% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementService.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/VersionManagementService.java index fa2b14b..d422dba 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/VersionManagementService.java @@ -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 getSystemVersionManagementPage(SystemVersionManagementPageReqVO pageReqVO); + PageResult getSystemVersionManagementPage(VersionManagementPageReqVO pageReqVO); /** @@ -68,7 +68,7 @@ public interface SystemVersionManagementService { * @param pageReqVO 分页查询 * @return 客户端版本管理分页 */ - PageResult getLts(SystemVersionManagementPageReqVO pageReqVO); + PageResult getLts(VersionManagementPageReqVO pageReqVO); /** * 版本发布 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/versionManagementServiceImpl.java similarity index 69% rename from zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementServiceImpl.java rename to zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/versionManagementServiceImpl.java index 239636b..56cee3e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/SystemVersionManagementServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/clientManage/service/versionManagementServiceImpl.java @@ -1,11 +1,10 @@ package com.zt.plat.module.qms.resource.clientManage.service; import cn.hutool.core.collection.CollUtil; -import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; -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 com.zt.plat.module.qms.resource.clientManage.controller.vo.uploadFileVo; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -13,11 +12,11 @@ import org.springframework.validation.annotation.Validated; import java.util.*; -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; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.qms.resource.clientManage.dal.mapper.SystemVersionManagementMapper; +import com.zt.plat.module.qms.resource.clientManage.dal.mapper.VersionManagementMapper; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; @@ -30,13 +29,13 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; */ @Service @Validated -public class SystemVersionManagementServiceImpl implements SystemVersionManagementService { +public class versionManagementServiceImpl implements VersionManagementService { @Resource - private SystemVersionManagementMapper systemVersionManagementMapper; + private VersionManagementMapper systemVersionManagementMapper; @Override - public SystemVersionManagementRespVO createSystemVersionManagement(SystemVersionManagementSaveReqVO createReqVO) { + public VersionManagementRespVO createSystemVersionManagement(VersionManagementSaveReqVO createReqVO) { //多条数据取第一条 if (createReqVO.getFiles().size() > 0) { uploadFileVo uploadFileVo = createReqVO.getFiles().get(0); @@ -47,18 +46,18 @@ public class SystemVersionManagementServiceImpl implements SystemVersionManageme } // 插入 - SystemVersionManagementDO systemVersionManagement = BeanUtils.toBean(createReqVO, SystemVersionManagementDO.class); + VersionManagementDO systemVersionManagement = BeanUtils.toBean(createReqVO, VersionManagementDO.class); // LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();//获取当前登录人通用方法 systemVersionManagement.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUser().getId())); systemVersionManagementMapper.insert(systemVersionManagement); // 返回 - return BeanUtils.toBean(systemVersionManagement, SystemVersionManagementRespVO.class); + return BeanUtils.toBean(systemVersionManagement, VersionManagementRespVO.class); } @Override - public void updateSystemVersionManagement(SystemVersionManagementSaveReqVO updateReqVO) { + public void updateSystemVersionManagement(VersionManagementSaveReqVO updateReqVO) { // 校验存在 validateSystemVersionManagementExists(updateReqVO.getId()); @@ -72,7 +71,7 @@ public class SystemVersionManagementServiceImpl implements SystemVersionManageme } // 更新 - SystemVersionManagementDO updateObj = BeanUtils.toBean(updateReqVO, SystemVersionManagementDO.class); + VersionManagementDO updateObj = BeanUtils.toBean(updateReqVO, VersionManagementDO.class); updateObj.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUser().getId())); @@ -96,7 +95,7 @@ public class SystemVersionManagementServiceImpl implements SystemVersionManageme } private void validateSystemVersionManagementExists(List ids) { - List list = systemVersionManagementMapper.selectByIds(ids); + List list = systemVersionManagementMapper.selectByIds(ids); if (CollUtil.isEmpty(list) || list.size() != ids.size()) { throw exception(SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS); } @@ -109,17 +108,17 @@ public class SystemVersionManagementServiceImpl implements SystemVersionManageme } @Override - public SystemVersionManagementDO getSystemVersionManagement(Long id) { + public VersionManagementDO getSystemVersionManagement(Long id) { return systemVersionManagementMapper.selectById(id); } @Override - public PageResult getSystemVersionManagementPage(SystemVersionManagementPageReqVO pageReqVO) { + public PageResult getSystemVersionManagementPage(VersionManagementPageReqVO pageReqVO) { return systemVersionManagementMapper.selectPage(pageReqVO); } @Override - public PageResult getLts(SystemVersionManagementPageReqVO pageReqVO) { + public PageResult getLts(VersionManagementPageReqVO pageReqVO) { return systemVersionManagementMapper.selectLts(pageReqVO); @@ -131,19 +130,19 @@ public class SystemVersionManagementServiceImpl implements SystemVersionManageme validateSystemVersionManagementExists(id); // 下线当前发布的版本 - List systemVersionManagementDOS = systemVersionManagementMapper.selectBySameCustDeviceId(id); + List versionManagementDOS = systemVersionManagementMapper.selectBySameCustDeviceCode(id); - if (systemVersionManagementDOS.size() > 0) { + if (versionManagementDOS.size() > 0) { - SystemVersionManagementDO systemVersionManagementDO = systemVersionManagementDOS.get(0); - SystemVersionManagementDO offlineVO = new SystemVersionManagementDO(); - offlineVO.setId(systemVersionManagementDO.getId()); + VersionManagementDO versionManagementDO = versionManagementDOS.get(0); + VersionManagementDO offlineVO = new VersionManagementDO(); + offlineVO.setId(versionManagementDO.getId()); offlineVO.setIssuanceFlag(2); systemVersionManagementMapper.updateById(offlineVO); } - SystemVersionManagementDO onlineVO = new SystemVersionManagementDO(); + VersionManagementDO onlineVO = new VersionManagementDO(); onlineVO.setId(id); onlineVO.setIssuanceFlag(1); systemVersionManagementMapper.updateById(onlineVO); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/SystemVersionManagementMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/VersionManagementMapper.xml similarity index 93% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/SystemVersionManagementMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/VersionManagementMapper.xml index 6cc78e5..be60ea9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/SystemVersionManagementMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/clientManage/data/dal/mapper/VersionManagementMapper.xml @@ -1,6 +1,6 @@ - +