增加应用删除接口

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPlatformController.java

@@ -3,10 +3,16 @@ package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessErrorCode;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysMobileMenu;
 import com.usky.system.domain.SysMobilePlatformMenu;
+import com.usky.system.domain.constants.UserConstants;
+import com.usky.system.mapper.SysTenantPlatformMapper;
 import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.SysPlatformService;
 import com.usky.system.service.vo.PlatformMenuVo;
@@ -34,6 +40,9 @@ public class SysPlatformController {
     @Autowired
     private ISysMenuService menuService;
 
+    @Autowired
+    private SysTenantPlatformMapper tenantPlatformMapper;
+
     /**
      * 平台挂管理-列表查询
      *
@@ -116,5 +125,20 @@ public class SysPlatformController {
         sysPlatformService.updateMobilePlatformMenu(mobilePlatformMenuVO);
         return ApiResult.success();
     }
+
+    /**
+     * 删除应用
+     */
+    @Log(title = "删除应用", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{platformId}")
+    public ApiResult<Void> remove(@PathVariable Integer platformId)
+    {
+        if (tenantPlatformMapper.checkPlatformUnique(platformId)>0)
+        {
+            return ApiResult.error("500", "删除应用失败，存在在用的租户单位");
+        }
+        sysPlatformService.deletePlatformById(platformId);
+        return ApiResult.success();
+    }
 }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenantMenu.java

@@ -43,10 +43,5 @@ public class SysTenantMenu implements Serializable {
 
     private String menuAliasName;
 
-    /**
-     * 应用ID
-     */
-    private Integer platformId;
-
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysTenantPlatformMapper.java

@@ -3,6 +3,7 @@ package com.usky.system.mapper;
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.domain.SysTenantPlatform;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,4 +16,12 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SysTenantPlatformMapper extends CrudMapper<SysTenantPlatform> {
+
+    /**
+     * 校验应用是否在用
+     *
+     * @param platformId 用户名称
+     * @return 结果
+     */
+    public int checkPlatformUnique(@Param("platformId") Integer platformId);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysPlatformService.java

@@ -32,4 +32,12 @@ public interface SysPlatformService extends CrudService<SysPlatform> {
     void updateMobilePlatformMenu(MobilePlatformMenuVO mobilePlatformMenuV0);
 
     List<SysPlatformVo> getPlatformAllList();
+
+    /**
+     * 通过应用ID删除应用
+     *
+     * @param platformId 应用ID
+     * @return 结果
+     */
+    void deletePlatformById(Integer platformId);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformServiceImpl.java

@@ -12,6 +12,7 @@ import com.usky.system.domain.SysPlatformMenu;
 import com.usky.system.domain.SysMobilePlatformMenu;
 import com.usky.system.mapper.SysMenuMapper;
 import com.usky.system.mapper.SysPlatformMapper;
+import com.usky.system.mapper.SysTenantPlatformMapper;
 import com.usky.system.service.SysMobilePlatformMenuService;
 import com.usky.system.service.SysPlatformMenuService;
 import com.usky.system.service.SysPlatformService;
@@ -37,8 +38,6 @@ import java.util.Map;
 @Service
 public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMapper, SysPlatform> implements SysPlatformService {
 
-    @Autowired
-    private SysMenuMapper menuMapper;
     @Autowired
     private SysPlatformMenuService sysPlatformMenuService;
     @Autowired
@@ -260,4 +259,17 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
         List<SysPlatformVo> list1 = baseMapper.getPlatformList(null, null, null, null, null, null);
         return list1;
     }
+
+    /**
+     * 通过应用ID删除应用
+     *
+     * @param platformId 应用ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void deletePlatformById(Integer platformId) {
+        baseMapper.deleteById(platformId);
+    }
+
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantPlatformServiceImpl.java

@@ -89,19 +89,17 @@ public class SysTenantPlatformServiceImpl extends AbstractCrudService<SysTenantP
         queryWrapper1.eq(SysTenantPlatform::getTenantId,tenantId);
         List<SysTenantPlatform> list = this.list(queryWrapper1);
         List<SysPlatformVo> list1 = sysPlatformService.getPlatformAllList();
-        if(CollectionUtils.isNotEmpty(list1)){
-            for(int i=0;i<list1.size();i++){
+        if(CollectionUtils.isNotEmpty(list)){
+            for(int i=0;i<list.size();i++){
                 TenantPlatformListVo tenantPlatformListVo = new TenantPlatformListVo();
-                tenantPlatformListVo.setPlatformName(list1.get(i).getPlatformName());
-                tenantPlatformListVo.setPlatformId(list1.get(i).getId());
-                tenantPlatformListVo.setIcon(list1.get(i).getIcon());
-                tenantPlatformListVo.setIsDefault(0);
-                tenantPlatformListVo.setIsSelected(0);
-                if(CollectionUtils.isNotEmpty(list)){
-                    for(int j=0;j<list.size();j++){
-                        if (list1.get(i).getId().equals(list.get(j).getPlatformId())){
-                            tenantPlatformListVo.setIsDefault(list.get(j).getIsDefault());
-                            tenantPlatformListVo.setIsSelected(1);
+                tenantPlatformListVo.setIsDefault(list.get(i).getIsDefault());
+                tenantPlatformListVo.setIsSelected(1);
+                if(CollectionUtils.isNotEmpty(list1)){
+                    for(int j=0;j<list1.size();j++){
+                        if (list1.get(j).getId().equals(list.get(i).getPlatformId())){
+                            tenantPlatformListVo.setPlatformName(list1.get(j).getPlatformName());
+                            tenantPlatformListVo.setPlatformId(list1.get(j).getId());
+                            tenantPlatformListVo.setIcon(list1.get(j).getIcon());
                         }
                     }
                 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantPlatformMapper.xml

@@ -8,4 +8,9 @@
         <result column="platform_id" property="platformId" />
         <result column="is_default" property="isDefault" />
     </resultMap>
+
+    <select id="checkPlatformUnique" resultType="int">
+        select count(1) from sys_tenant_platform where platform_id = #{platformId} limit 1
+    </select>
+
 </mapper>