ソースを参照

!703 update 优化客户端管理
* update 优化客户端管理

AprilWind 1 年間 前
コミット
6722f2eeed

+ 4 - 16
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 package org.dromara.system.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -43,11 +44,10 @@ public class SysClientServiceImpl implements ISysClientService {
     @Override
     @Override
     public SysClientVo queryById(Long id) {
     public SysClientVo queryById(Long id) {
         SysClientVo vo = baseMapper.selectVoById(id);
         SysClientVo vo = baseMapper.selectVoById(id);
-        vo.setGrantTypeList(List.of(vo.getGrantType().split(",")));
+        vo.setGrantTypeList(StringUtils.splitList(vo.getGrantType()));
         return vo;
         return vo;
     }
     }
 
 
-
     /**
     /**
      * 查询客户端管理
      * 查询客户端管理
      */
      */
@@ -64,7 +64,7 @@ public class SysClientServiceImpl implements ISysClientService {
     public TableDataInfo<SysClientVo> queryPageList(SysClientBo bo, PageQuery pageQuery) {
     public TableDataInfo<SysClientVo> queryPageList(SysClientBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
         Page<SysClientVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<SysClientVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        result.getRecords().forEach(r -> r.setGrantTypeList(List.of(r.getGrantType().split(","))));
+        result.getRecords().forEach(r -> r.setGrantTypeList(StringUtils.splitList(r.getGrantType())));
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }
 
 
@@ -93,8 +93,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @Override
     @Override
     public Boolean insertByBo(SysClientBo bo) {
     public Boolean insertByBo(SysClientBo bo) {
         SysClient add = MapstructUtils.convert(bo, SysClient.class);
         SysClient add = MapstructUtils.convert(bo, SysClient.class);
-        validEntityBeforeSave(add);
-        add.setGrantType(String.join(",", bo.getGrantTypeList()));
+        add.setGrantType(CollUtil.join(bo.getGrantTypeList(), StringUtils.SEPARATOR));
         // 生成clientid
         // 生成clientid
         String clientKey = bo.getClientKey();
         String clientKey = bo.getClientKey();
         String clientSecret = bo.getClientSecret();
         String clientSecret = bo.getClientSecret();
@@ -113,7 +112,6 @@ public class SysClientServiceImpl implements ISysClientService {
     @Override
     @Override
     public Boolean updateByBo(SysClientBo bo) {
     public Boolean updateByBo(SysClientBo bo) {
         SysClient update = MapstructUtils.convert(bo, SysClient.class);
         SysClient update = MapstructUtils.convert(bo, SysClient.class);
-        validEntityBeforeSave(update);
         update.setGrantType(String.join(",", bo.getGrantTypeList()));
         update.setGrantType(String.join(",", bo.getGrantTypeList()));
         return baseMapper.updateById(update) > 0;
         return baseMapper.updateById(update) > 0;
     }
     }
@@ -130,22 +128,12 @@ public class SysClientServiceImpl implements ISysClientService {
                 .eq(SysClient::getClientId, clientId));
                 .eq(SysClient::getClientId, clientId));
     }
     }
 
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(SysClient entity) {
-        //TODO 做一些数据校验,如唯一约束
-    }
-
     /**
     /**
      * 批量删除客户端管理
      * 批量删除客户端管理
      */
      */
     @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true)
     @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true)
     @Override
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
         return baseMapper.deleteByIds(ids) > 0;
         return baseMapper.deleteByIds(ids) > 0;
     }
     }
 }
 }