更新校验企业方案套餐名称唯一性的功能

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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.constant.TenantConstants;
@@ -12,6 +13,7 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.core.validate.AddGroup;
 import com.dsk.common.core.validate.EditGroup;
 import com.dsk.common.enums.BusinessType;
+import com.dsk.system.domain.SysTenantPackage;
 import com.dsk.system.domain.bo.SysTenantPackageBo;
 import com.dsk.system.domain.vo.SysTenantPackageSelectVo;
 import com.dsk.system.domain.vo.SysTenantPackageVo;
@@ -94,6 +96,9 @@ public class SysTenantPackageController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
+        if (tenantPackageService.checkDeptNameUnique(bo)) {
+            return R.fail("新增方案'" + bo.getPackageName() + "'失败，方案名称已存在");
+        }
         return toAjax(tenantPackageService.insertByBo(bo));
     }
 
@@ -106,6 +111,10 @@ public class SysTenantPackageController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) {
+        SysTenantPackage tenantPackage = tenantPackageService.selectTenantPackageByName(bo.getPackageName());
+        if (ObjectUtil.isNotNull(tenantPackage) && !tenantPackage.getPackageId().equals(bo.getPackageId())) {
+            return R.fail("修改方案'" + bo.getPackageName() + "'失败，方案名称已存在");
+        }
         return toAjax(tenantPackageService.updateByBo(bo));
     }
 

dsk-common/src/main/java/com/dsk/common/constant/TenantPackageConstants.java

@@ -17,4 +17,14 @@ public interface TenantPackageConstants {
      */
     String DISABLE = "1";
 
+    /**
+     * 租户套餐已逻辑删除装填
+     */
+    String NOT_LOGIC_DEL = "0";
+
+    /**
+     * 租户套餐已逻辑删除装填
+     */
+    String IS_LOGIC_DEL = "2";
+
 }

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

@@ -2,6 +2,7 @@ package com.dsk.system.service;
 
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.domain.SysTenantPackage;
 import com.dsk.system.domain.bo.SysTenantPackageBo;
 import com.dsk.system.domain.vo.SysTenantPackageSelectVo;
 import com.dsk.system.domain.vo.SysTenantPackageVo;
@@ -15,6 +16,15 @@ import java.util.List;
  * @date 2023.08.23
  */
 public interface ISysTenantPackageService {
+
+    /**
+     * 根据方案名称查询方案
+     *
+     * @param packageName 方案名称
+     * @return 方案
+     */
+    SysTenantPackage selectTenantPackageByName(String packageName);
+
     /**
      * 查询租户套餐列表
      */
@@ -54,4 +64,13 @@ public interface ISysTenantPackageService {
      * 校验并批量删除租户套餐信息
      */
     Boolean deleteWithValidByIds(List<Long> ids, boolean isValid);
+
+    /**
+     * 校验方案名称是否唯一
+     *
+     * @param bo 方案信息
+     * @return 结果
+     */
+    boolean checkDeptNameUnique(SysTenantPackageBo bo);
+
 }

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

@@ -38,6 +38,18 @@ public class ISysTenantPackageServiceImpl implements ISysTenantPackageService {
     private final SysTenantPackageMapper baseMapper;
     private final SysTenantMapper tenantMapper;
 
+    /**
+     * 根据方案名称查询方案
+     *
+     * @param packageName 方案名称
+     * @return 方案
+     */
+    @Override
+    public SysTenantPackage selectTenantPackageByName(String packageName) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<SysTenantPackage>()
+                .eq(SysTenantPackage::getPackageName, packageName));
+    }
+
     /**
      * 查询租户套餐列表
      */
@@ -162,4 +174,16 @@ public class ISysTenantPackageServiceImpl implements ISysTenantPackageService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 校验方案名称是否唯一
+     *
+     * @param bo 方案信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkDeptNameUnique(SysTenantPackageBo bo) {
+        return baseMapper.exists(new LambdaQueryWrapper<SysTenantPackage>()
+                .eq(SysTenantPackage::getPackageName, bo.getPackageName()));
+    }
 }