fix commit

修改了部分代码的代码规范,修复了管理企业功能的已知bug
server_2024_3_26_liyuan
玉安君 2024-03-29 20:23:26 +08:00
parent 0ad5f18336
commit bda7de379f
1 changed files with 24 additions and 24 deletions

View File

@ -30,25 +30,27 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
private RedisService redisService;
@Override
public List<SysConfig> pageQuery (SysConfig config) {
public List<SysConfig> pageQuery(SysConfig config) {
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(config.getConfigName())){
queryWrapper.like(SysConfig::getConfigName, config.getConfigName());
}
if (StringUtils.isNotEmpty(config.getConfigType())){
queryWrapper.like(SysConfig::getConfigType, config.getConfigType());
}
if (StringUtils.isNotEmpty(config.getConfigKey())){
queryWrapper.like(SysConfig::getConfigKey, config.getConfigKey());
}
//模糊条件 查询配置名称
queryWrapper.like(StringUtils.isNotEmpty(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
//模块条件 通过配置进行模糊查询
queryWrapper.like(StringUtils.isNotEmpty(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
//模糊条件 通过配置键 进行查询
queryWrapper.like(StringUtils.isNotEmpty(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
Object beginTime = config.getParams().get("beginTime");
if (Objects.nonNull(beginTime) && beginTime instanceof Date beginDate){
queryWrapper.gt(SysConfig::getCreateTime, beginDate);
}
//区间查询,查询大于配置创建时间的配置
queryWrapper.gt(Objects.nonNull(beginTime) && (beginTime instanceof Date beginDate), SysConfig::getCreateTime, beginTime);
Object endTime = config.getParams().get("endTime");
if (Objects.nonNull(endTime) && endTime instanceof Date endDate){
queryWrapper.lt(SysConfig::getCreateTime, endDate);
}
//区间查询,查询小于配置创建时间的配置
queryWrapper.lt((Objects.nonNull(endTime) && endTime instanceof Date endDate), SysConfig::getCreateTime, endTime);
return this.list(queryWrapper);
}
@ -56,11 +58,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
* Key
*
* @param configKey
*
* @return
*/
@Override
public String selectConfigByKey (String configKey) {
public String selectConfigByKey(String configKey) {
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
Assert.notNull(configKey, "key不可为空");
queryWrapper.eq(SysConfig::getConfigKey, configKey);
@ -69,14 +70,14 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
}
@Override
public boolean checkConfigKeyUnique (SysConfig config) {
public boolean checkConfigKeyUnique(SysConfig config) {
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey());
return this.count(queryWrapper) > 0;
}
@Override
public void resetConfigCache () {
public void resetConfigCache() {
this.clearConfigCache();
this.loadingConfigCache();
}
@ -85,7 +86,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*
*/
@Override
public void clearConfigCache () {
public void clearConfigCache() {
Collection<String> keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*");
redisService.deleteObject(keys);
}
@ -94,7 +95,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*
*/
@Override
public void loadingConfigCache () {
public void loadingConfigCache() {
List<SysConfig> configsList = this.list();
for (SysConfig config : configsList) {
redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@ -105,10 +106,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
* cache key
*
* @param configKey
*
* @return key
*/
private String getCacheKey (String configKey) {
private String getCacheKey(String configKey) {
return CacheConstants.SYS_CONFIG_KEY + configKey;
}
}