服务库服务基础管理接口-修改版

src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java

@@ -3,6 +3,8 @@ package com.pms.ocp.controller;
 import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.OcpTenantGroupDto;
+import com.pms.ocp.model.entity.OcpApiGroup;
+import com.pms.ocp.model.entity.OcpTenantGroup;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.TenantBasicManagementService;
 import com.pms.ocp.service.TenantService;
@@ -47,23 +49,23 @@ public class TenantBasicManagementController {
     @PostMapping("/issue")
     public ResponseVO TenantIssue(@RequestParam(required = false) String tenantPromotion,
                                   @RequestParam(required = false) String tenantCodes) {
-        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
-            return ResponseVO.error("统招");
-        } else {
+//        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
+//            return ResponseVO.error("统招");
+//        } else {
             return tenantBasicManagementService.tenantIssue(tenantCodes);
-        }
+//        }
     }
 
     @ApiOperation("应用订阅")
     @PostMapping("/login")
     public ResponseVO TenantLogin(@RequestParam(required = false) String tenantPromotion,
                                   @RequestParam(required = false) String tenantCodes) {
-        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
-            return ResponseVO.error("统招");
-        } else {
+//        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
+//            return ResponseVO.error("统招");
+//        } else {
             tenantBasicManagementService.tenantLogin(tenantCodes);
             return ResponseVO.ok();
-        }
+//        }
 
     }
 
@@ -81,6 +83,12 @@ public class TenantBasicManagementController {
         return tenantBasicManagementService.applyRegister(ocpTenantBaseDto);
 
     }
+    @ApiOperation("应用树层级")
+    @GetMapping("/apiBaseTreeOther")
+    public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) {
+        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode);
+        return ResponseVO.ok(ocpApiGroups);
+    }
 
 
 }

src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java

@@ -4,7 +4,11 @@ package com.pms.ocp.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
+    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupPcode") String tenantGroupPcode);
 }

src/main/java/com/pms/ocp/service/TenantBasicManagementService.java

@@ -2,7 +2,9 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
+import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantGroup;
 import com.pms.ocp.model.vo.ResponseVO;
 
 import java.sql.Timestamp;
@@ -46,4 +48,12 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @param ocpTenantBaseDto
      */
     ResponseVO applyRegister(OcpTenantBaseDto ocpTenantBaseDto);
+
+    /**
+     * 应用树层级
+     * @param tenantGroupCode
+     * @param tenantGroupPcode
+     * @return
+     */
+    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode);
 }

src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantExtentMapper;
+import com.pms.ocp.mapper.OcpTenantGroupMapper;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
@@ -33,6 +34,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     private OcpApiTenantRelService ocpApiTenantRelService;
     @Autowired
     private OcpTenantGroupService ocpTenantGroupService;
+    @Autowired
+    private OcpTenantGroupMapper ocpTenantGroupMapper;
 
     /**
      * 条件查询
@@ -172,4 +175,17 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         return ResponseVO.ok();
     }
 
+    /**
+     * 应用树层级
+     *
+     * @param tenantGroupCode
+     * @param tenantGroupPcode
+     * @return
+     */
+    @Override
+    public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) {
+      List<OcpTenantGroup>  ocpTenantGroups=ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode);
+        return ocpTenantGroups;
+    }
+
 }

src/main/resources/mapper/OcpGroup.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpTenantGroupMapper">
+    <select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        select tenant_group_code,tenant_group_name,tenant_group_pcode,tenant_group_level from ocp_tenant_group where
+        is_delete = 0
+        <if test="tenantGroupPcode ==null">
+            and tenant_group_pcode is null
+        </if>
+        <if test="tenantGroupPcode !=null and tenantGroupPcode !=''">
+            and tenant_group_pcode =#{tenantGroupPcode}
+        </if>
+        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
+            and tenant_group_code=#{tenantGroupCode}
+        </if>
+    </select>
+
+
+</mapper>