Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

原预打包配置部分描述修改为分堆

Browse Source
This commit is contained in:
gaoqr
2026-03-20 15:18:03 +08:00
parent b600e18132
commit afe7ba3e4e
6 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java
+1 -1
View File
@@ -8,7 +8,7 @@ import lombok.Getter;
@Getter @Getter
public enum UserSettingTypeEnum { public enum UserSettingTypeEnum {
PREPACKAGED(1,"预打包"), HEAPSPLIT(1,"分堆"),
PACKAGED(2, "打包"); PACKAGED(2, "打包");
private Integer type; private Integer type;
private String name; private String name;
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/setting/dto/PackageConfigDTO.java
+1 -3
View File
@@ -1,7 +1,5 @@
package com.cf.imes.module.system.api.setting.dto; package com.cf.imes.module.system.api.setting.dto;
import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
@@ -26,7 +24,7 @@ public class PackageConfigDTO {
private Long userId; private Long userId;
@Schema(description = "配置类型： 1 预打包，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "配置类型： 1 分堆，2 打包", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer type; private Integer type;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java
+2 -3
View File
@@ -33,8 +33,7 @@ public class SettingController {
@PutMapping("/insert") @PutMapping("/insert")
@Operation(summary = "新增打包系统配置") @Operation(summary = "新增打包系统配置")
@OperateLog(module="管理后台 - 系统打包配置",name = "新增打包/预打包系统配置",type = CREATE) @OperateLog(module="管理后台 - 系统打包配置",name = "新增分堆/打包系统配置",type = CREATE)
//@PreAuthorize("@ss.hasPermission('system:data-source:query')")
public CommonResult<Long> insertSetting( @RequestBody PackageConfigReqVO reqVO ) { public CommonResult<Long> insertSetting( @RequestBody PackageConfigReqVO reqVO ) {
return success(settingService.insertSetting(reqVO)); return success(settingService.insertSetting(reqVO));
@@ -46,7 +45,7 @@ public class SettingController {
@PostMapping("/update") @PostMapping("/update")
@Operation(summary = "更新打包系统配置") @Operation(summary = "更新打包系统配置")
@OperateLog(module="管理后台 - 系统打包配置",name = "更新打包/预打包系统配置",type = UPDATE) @OperateLog(module="管理后台 - 系统打包配置",name = "更新分堆/打包系统配置",type = UPDATE)
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-config','manage:pack:pre-pack-config')") @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-config','manage:pack:pre-pack-config')")
public CommonResult<Long> updateSetting( @RequestBody PackageConfigReqVO reqVO ) { public CommonResult<Long> updateSetting( @RequestBody PackageConfigReqVO reqVO ) {
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java
+1 -9
View File
@@ -19,15 +19,7 @@ public class PackageConfigReqVO {
private Long id; private Long id;
// @Schema(description = "组织ID") @Schema(description = "配置类型： 1 分堆，2 打包", requiredMode = Schema.RequiredMode.REQUIRED)
// private Long organId;
//
//
// @Schema(description = "用户ID")
// private Long userId;
@Schema(description = "配置类型： 1 预打包，2 打包", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer type; private Integer type;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/setting/PackageConfigDO.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class PackageConfigDO {
private Long userId; private Long userId;
/** /**
* 配置类型： 1 预打包，2 打包 * 配置类型： 1 分堆，2 打包
*/ */
private Integer type; private Integer type;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class SettingServiceImpl implements SettingService{
// 更新 // 更新
PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId()); PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId());
if (packageConfigDO == null) { 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) { if(reqVO.getSetting() != null) {
packageConfigDO.setSetting(JsonUtils.zipString(reqVO.getSetting().toJSONString())); packageConfigDO.setSetting(JsonUtils.zipString(reqVO.getSetting().toJSONString()));