gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.0】【config】整理config代码

pull/57/head
fengshuonan 2023-07-10 20:52:33 +08:00
parent 6cd3117c16
commit 826787f901
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/pojo/param/SysConfigParam.java
View File

@ -26,16 +26,14 @@ package cn.stylefeng.roses.kernel.config.modular.pojo.param;
import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest.batchDelete;
import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue; import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Set;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Set;
/** /**
* 系统参数配置参数 * 系统参数配置参数
@ -103,7 +101,7 @@ public class SysConfigParam extends BaseRequest {
private String groupCode; private String groupCode;
/** /**
* 角色id集合，用在批量删除 * configId集合，用在批量删除
*/ */
@NotEmpty(message = "configId集合不能为空", groups = batchDelete.class) @NotEmpty(message = "configId集合不能为空", groups = batchDelete.class)
@ChineseDescription("configId集合，用在批量删除") @ChineseDescription("configId集合，用在批量删除")

44
kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
View File

@ -298,10 +298,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
String searchText = sysConfigParam.getSearchText(); String searchText = sysConfigParam.getSearchText();
if (ObjectUtil.isNotEmpty(searchText)) { if (ObjectUtil.isNotEmpty(searchText)) {
queryWrapper.and(wq -> { queryWrapper.and(wq -> {
wq.like(SysConfig::getConfigName, searchText) wq.like(SysConfig::getConfigName, searchText)
.or().like(SysConfig::getConfigCode, searchText) .or().like(SysConfig::getConfigCode, searchText)
.or().like(SysConfig::getConfigValue, searchText) .or().like(SysConfig::getConfigValue, searchText)
.or().like(SysConfig::getRemark, searchText); .or().like(SysConfig::getRemark, searchText);
}); });
} }
@ -315,27 +315,27 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
return queryWrapper; return queryWrapper;
} }
@Override @Override
public void batchDelete(SysConfigParam sysConfigParam) { public void batchDelete(SysConfigParam sysConfigParam) {
for(Long configId:sysConfigParam.getConfigIdList()){ for (Long configId : sysConfigParam.getConfigIdList()) {
// 1.根据id获取常量 // 1.根据id获取常量
SysConfig sysConfig = this.getById(configId); SysConfig sysConfig = this.getById(configId);
if (ObjectUtil.isEmpty(sysConfig) || sysConfig.getDelFlag().equals(YesOrNotEnum.Y.getCode())) { if (ObjectUtil.isEmpty(sysConfig) || sysConfig.getDelFlag().equals(YesOrNotEnum.Y.getCode())) {
throw new ConfigException(ConfigExceptionEnum.CONFIG_NOT_EXIST, "id: " + sysConfigParam.getConfigId()); throw new ConfigException(ConfigExceptionEnum.CONFIG_NOT_EXIST, "id: " + sysConfigParam.getConfigId());
} }
// 2.不能删除系统参数 // 2.不能删除系统参数
if (YesOrNotEnum.Y.getCode().equals(configId)) { if (YesOrNotEnum.Y.getCode().equals(sysConfig.getSysFlag())) {
throw new ConfigException(ConfigExceptionEnum.CONFIG_SYS_CAN_NOT_DELETE); throw new ConfigException(ConfigExceptionEnum.CONFIG_SYS_CAN_NOT_DELETE);
} }
// 3.逻辑删除 // 3.逻辑删除
this.removeById(configId); this.removeById(configId);
// 4.删除对应context // 4.删除对应context
ConfigContext.me().deleteConfig(sysConfig.getConfigCode()); ConfigContext.me().deleteConfig(sysConfig.getConfigCode());
} }
} }
} }