tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 删除系统配置提示未授权bug修复

Browse Source 
删除系统配置提示未授权bug修复
This commit is contained in:
Theo
2024-07-30 19:36:28 +08:00
parent d5077a395a
commit 13ad4fd1db
7 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/system/controller/SysConfigController.java
View File

@@ -73,7 +73,7 @@ public class SysConfigController {
@DeleteMapping("/{id}")
@Operation(summary = "删除系统配置")
@PreAuthorize("@ss.hasPerm('business:config:delete')")
@PreAuthorize("@ss.hasPerm('sys:config:delete')")
public Result<?> delete(@PathVariable Long id) {
return Result.judge(sysConfigService.delete(id));
}

6
src/main/java/com/youlai/system/model/entity/SysConfig.java
View File

@@ -19,13 +19,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
public class SysConfig extends BaseEntity {
@Schema(description = "配置名称")
private String sysName;
private String configName;
@Schema(description = "配置key")
private String sysKey;
private String configKey;
@Schema(description = "配置值")
private String sysValue;
private String configValue;
@Schema(description = "描述、备注")
private String remark;

6
src/main/java/com/youlai/system/model/form/ConfigForm.java
View File

@@ -26,15 +26,15 @@ public class ConfigForm implements Serializable {
@NotBlank(message = "配置名称不能为空")
@Schema(description = "配置名称")
private String sysName;
private String configName;
@NotBlank(message = "配置key不能为空")
@Schema(description = "配置key")
private String sysKey;
private String configKey;
@NotBlank(message = "配置值不能为空")
@Schema(description = "配置值")
private String sysValue;
private String configValue;
@Schema(description = "描述、备注")
private String remark;

6
src/main/java/com/youlai/system/model/vo/ConfigVO.java
View File

@@ -25,13 +25,13 @@ public class ConfigVO {
private Long id;
@Schema(description = "配置名称")
private String sysName;
private String configName;
@Schema(description = "配置key")
private String sysKey;
private String configKey;
@Schema(description = "配置值")
private String sysValue;
private String configValue;
@Schema(description = "描述、备注")
private String remark;

8
src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
Page<SysConfig> page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize());
QueryWrapper<SysConfig> query = new QueryWrapper<>();
if(StringUtils.isNotBlank(configPageQuery.getKeywords())) {
query.and(q -> q.like("sys_key", configPageQuery.getKeywords()).or().like("sys_name", configPageQuery.getKeywords()));
query.and(q -> q.like("config_key", configPageQuery.getKeywords()).or().like("config_name", configPageQuery.getKeywords()));
}
Page<SysConfig> pageList = this.page(page, query);
return sysConfigConverter.convertToPageVo(pageList);
@@ -63,7 +63,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*/
@Override
public boolean save(ConfigForm configForm) {
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("sys_key", configForm.getSysKey())) == 0, "配置key已存在");
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("config_key", configForm.getConfigKey())) == 0, "配置key已存在");
SysConfig sysConfig = sysConfigConverter.toEntity(configForm);
sysConfig.setCreateBy(SecurityUtils.getUserId());
sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS);
@@ -90,7 +90,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*/
@Override
public boolean edit(Long id, ConfigForm configForm) {
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("sys_key", configForm.getSysKey()).ne("id", id)) == 0, "配置key已存在");
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置key已存在");
SysConfig sysConfig = sysConfigConverter.toEntity(configForm);
sysConfig.setUpdateBy(SecurityUtils.getUserId());
return this.update(sysConfig, new QueryWrapper<SysConfig>().eq("id", id));
@@ -118,7 +118,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
redisTemplate.delete(RedisKeyConstants.SYSTEM_CONFIG_KEY);
List<SysConfig> list = this.list();
if (list != null) {
Map<String, String> map = list.stream().collect(Collectors.toMap(SysConfig::getSysKey, SysConfig::getSysValue));
Map<String, String> map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue));
redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY,map);
return true;
}