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

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

@@ -81,8 +81,8 @@ public class TenantBasicManagementController {
     }
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-    public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(String tenantGroupCode,String code) {
-        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,code);
+        public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) {
+        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode);
         return ResponseVO.ok(ocpApiGroups);
     }
 

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
-    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCode") String p);
+    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode);
 
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
 }

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

@@ -56,10 +56,10 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
     /**
      * 应用树层级
      * @param tenantGroupCode
-     * @param tenantGroupPcode
+     * @param tenantGroupCompanyCode
      * @return
      */
-    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupPcode);
+    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupCompanyCode);
 
     /**
      * 应用列表

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

@@ -207,12 +207,12 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      * 应用树层级
      *
      * @param tenantGroupCode
-     * @param tenantGroupPcode
+     * @param tenantGroupCompanyCode
      * @return
      */
     @Override
-    public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) {
-        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupPcode);
+    public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) {
+        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         return ocpTenantGroups;
     }
 
@@ -227,8 +227,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         if (tenantDto.getPageNum() == null || tenantDto.getPageSize() == null) {
             return ResponseVO.error("分页参数不能为空");
         }
-        tenantGroup.add(tenantDto.getTenantCode());
-        setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantCode());
+        tenantGroup.add(tenantDto.getTenantGroupCode());
+        setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantGroupCode());
         PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize());
 
         List<OcpTenantBaseDto> ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto);
@@ -236,17 +236,13 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         PageInfo<OcpTenantBaseDto> pageInfo = new PageInfo<>(ocpTenantBaseDto);
         return ResponseVO.ok(pageInfo);
 
-//        List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
-//        tenantGroupCode.clear();
-//        PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
-//        return ResponseVO.ok(pageInfo);
     }
 
-    public void setGroupIdValue(String apiGroupCompanyCode, String code) {
-        List<String> codes = getIdsByPIdPub(apiGroupCompanyCode, code);
+    public void setGroupIdValue(String tenantGroupCompanyCode, String tenantGroupCode) {
+        List<String> codes = getIdsByPIdPub(tenantGroupCompanyCode, tenantGroupCode);
         if (codes.size() > 0) {
             for (String cod : codes) {
-                setGroupIdValue(apiGroupCompanyCode, cod);
+                setGroupIdValue(tenantGroupCompanyCode, cod);
                 tenantGroup.add(cod);
             }
             ;
@@ -254,8 +250,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 
     }
 
-    public List<String> getIdsByPIdPub(String apiGroupCompanyCode, String code) {
-        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(apiGroupCompanyCode, code);
+    public List<String> getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) {
+        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode);
         return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList());
     }
 

src/main/resources/mapper/OcpGroup.xml

@@ -19,9 +19,14 @@
     <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="p !=null and p!=''">
-            and tenant_group_pcode=#{p}
+        <if test="tenantGroupCode == null">
+            and  tenant_group_pcode is null
+        </if>
+        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
+                and tenant_group_company_code=#{tenantGroupCompanyCode}
+        </if>
+        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
+            and tenant_group_pcode=#{tenantGroupCode}
         </if>
     </select>