新增租户配置添加接口

dsk-admin/src/main/java/com/dsk/web/controller/system/SysConfigController.java

@@ -95,10 +95,9 @@ public class SysConfigController extends BaseController {
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping("/tenant/add")
     public R<Void> tenantAdd(@Validated @RequestBody SysConfig config) {
-        if (!configService.checkConfigKeyUnique(config)) {
-            return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        TenantHelper.ignore(()->configService.insertTenantConfig(config));
+        TenantHelper.ignore(() -> {
+            configService.insertTenantConfig(config);
+        });
         return R.ok();
     }
 
@@ -152,8 +151,6 @@ public class SysConfigController extends BaseController {
     }
 
 
-
-
     /**
      * 获取大司空open 插件访问token
      */
@@ -161,7 +158,7 @@ public class SysConfigController extends BaseController {
     @Log(title = "获取dsk访问token", businessType = BusinessType.OTHER)
     @GetMapping("/dsk/accessToken")
     public R<DskAccessTokenVO> dskAccessToken() {
-        DskAccessTokenVO dskAccessTokenVO=  configService.getDskAccessToken();
+        DskAccessTokenVO dskAccessTokenVO = configService.getDskAccessToken();
         return R.ok(dskAccessTokenVO);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/ISysConfigService.java

@@ -61,7 +61,7 @@ public interface ISysConfigService {
      * @param config 参数配置信息
      * @return 结果
      */
-    String insertTenantConfig(SysConfig config);
+    void insertTenantConfig(SysConfig config);
 
     /**
      * 修改参数配置

dsk-system/src/main/java/com/dsk/system/service/impl/SysConfigServiceImpl.java

@@ -31,6 +31,7 @@ import com.dsk.system.domain.SysTenant;
 import com.dsk.system.mapper.SysConfigMapper;
 import com.dsk.system.mapper.SysTenantMapper;
 import com.dsk.system.service.ISysConfigService;
+import jodd.bean.BeanException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CachePut;
@@ -150,24 +151,33 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @return 结果
      */
     @Override
-    public String insertTenantConfig(SysConfig config) {
-        List<SysConfig> list = new ArrayList<>();
-        SysConfig bean = new SysConfig();
-        BeanUtil.copyProperties(config, bean);
-        bean.setTenantId(TenantConstants.DEFAULT_TENANT_ID);
+    public void insertTenantConfig(SysConfig config) {
+        //重复验证
+        boolean exists = baseMapper.exists(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getConfigKey, config.getConfigKey()));
+        if(exists){
+            throw new BeanException("当前配置键已存在！");
+        }
 
+        List<SysConfig> list = new ArrayList<>();
+        SysConfig admin = new SysConfig();
+        BeanUtil.copyProperties(config, admin);
+        admin.setTenantId(TenantConstants.DEFAULT_TENANT_ID);
+        list.add(admin);
 
         List<SysTenant> sysTenants = tenantMapper.selectList();
-
-        if (CollectionUtils.isEmpty(sysTenants)) {
-
+        if (!CollectionUtils.isEmpty(sysTenants)) {
+            for (SysTenant sysTenant : sysTenants) {
+                SysConfig bean = new SysConfig();
+                BeanUtil.copyProperties(config, bean);
+                bean.setTenantId(sysTenant.getTenantId());
+                list.add(bean);
+            }
         }
 
-        int row = baseMapper.insert(config);
-        if (row > 0) {
-            return config.getConfigValue();
+        boolean b = baseMapper.insertBatch(list);
+        if (!b) {
+            throw new ServiceException("操作失败");
         }
-        throw new ServiceException("操作失败");
     }
 
     /**
@@ -300,7 +310,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
 
     public List<SysConfig> queryListByKey(String keyName) {
         LambdaQueryWrapper<SysConfig> dsk = new LambdaQueryWrapper<SysConfig>().likeRight(SysConfig::getConfigKey, keyName);
-        return TenantHelper.ignore(()->baseMapper.selectList(dsk));
+        return TenantHelper.ignore(() -> baseMapper.selectList(dsk));
     }
 
 }