From afe7ba3e4e3d880696c3d36d8b31475309f6523c Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 20 Mar 2026 15:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E9=A2=84=E6=89=93=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=83=A8=E5=88=86=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=88=86=E5=A0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/enums/UserSettingTypeEnum.java | 2 +- .../system/api/setting/dto/PackageConfigDTO.java | 4 +--- .../controller/admin/setting/SettingController.java | 5 ++--- .../admin/setting/vo/PackageConfigReqVO.java | 10 +--------- .../system/dal/dataobject/setting/PackageConfigDO.java | 2 +- .../system/service/setting/SettingServiceImpl.java | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java index 715f95bd7..44ba68a82 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; @Getter public enum UserSettingTypeEnum { - PREPACKAGED(1,"预打包"), + HEAPSPLIT(1,"分堆"), PACKAGED(2, "打包"); private Integer type; private String name; diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/setting/dto/PackageConfigDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/setting/dto/PackageConfigDTO.java index b6653620b..85011e849 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/setting/dto/PackageConfigDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/setting/dto/PackageConfigDTO.java @@ -1,7 +1,5 @@ package com.cf.imes.module.system.api.setting.dto; - -import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,7 +24,7 @@ public class PackageConfigDTO { private Long userId; - @Schema(description = "配置类型： 1 预打包，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "配置类型： 1 分堆，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) private Integer type; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java index ade8da9ce..1f42a4d6a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java @@ -33,8 +33,7 @@ public class SettingController { @PutMapping("/insert") @Operation(summary = "新增打包系统配置") - @OperateLog(module="管理后台 - 系统打包配置",name = "新增打包/预打包系统配置",type = CREATE) - //@PreAuthorize("@ss.hasPermission('system:data-source:query')") + @OperateLog(module="管理后台 - 系统打包配置",name = "新增分堆/打包系统配置",type = CREATE) public CommonResult insertSetting( @RequestBody PackageConfigReqVO reqVO ) { return success(settingService.insertSetting(reqVO)); @@ -46,7 +45,7 @@ public class SettingController { @PostMapping("/update") @Operation(summary = "更新打包系统配置") - @OperateLog(module="管理后台 - 系统打包配置",name = "更新打包/预打包系统配置",type = UPDATE) + @OperateLog(module="管理后台 - 系统打包配置",name = "更新分堆/打包系统配置",type = UPDATE) @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-config','manage:pack:pre-pack-config')") public CommonResult updateSetting( @RequestBody PackageConfigReqVO reqVO ) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java index ce040c600..5bd7414c4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java @@ -19,15 +19,7 @@ public class PackageConfigReqVO { private Long id; -// @Schema(description = "组织ID") -// private Long organId; -// -// -// @Schema(description = "用户ID") -// private Long userId; - - - @Schema(description = "配置类型： 1 预打包，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "配置类型： 1 分堆，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) private Integer type; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/setting/PackageConfigDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/setting/PackageConfigDO.java index 1f4b273ad..14c1503e9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/setting/PackageConfigDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/setting/PackageConfigDO.java @@ -29,7 +29,7 @@ public class PackageConfigDO { private Long userId; /** - * 配置类型： 1 预打包，2 打包 + * 配置类型： 1 分堆，2 打包 */ private Integer type; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java index 271e73e07..d048da650 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java @@ -56,7 +56,7 @@ public class SettingServiceImpl implements SettingService{ // 更新 PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId()); if (packageConfigDO == null) { - throw new ServiceException(CURRENTLY_NO_CONFIGURATION_AVAILABLE,reqVO.getType() == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName()); + throw new ServiceException(CURRENTLY_NO_CONFIGURATION_AVAILABLE, reqVO.getType() == 1 ? UserSettingTypeEnum.HEAPSPLIT.getName() : UserSettingTypeEnum.PACKAGED.getName()); } if(reqVO.getSetting() != null) { packageConfigDO.setSetting(JsonUtils.zipString(reqVO.getSetting().toJSONString()));