diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 4b7e96d68e8cb1f5a58899145fab7d3d466e6d48..a147dc01ccb4b6ecdcead10139a3d4d902eea00d 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -81,8 +81,8 @@ public class TenantBasicManagementController { } @ApiOperation("应用树层级") @GetMapping("/tenantBaseTreeOther") - public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) { - List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode); + public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) { + List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode); return ResponseVO.ok(ocpApiGroups); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index ca3a6091d66408573f11b969baa11edcf153b90b..b70fd256a586513877362dbbffc2ae9bf49ef0a9 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -2,6 +2,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.OcpTenantGroup; @@ -12,7 +13,7 @@ import java.util.List; @Mapper public interface OcpTenantGroupMapper extends BaseMapper { - List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); + List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); List selectPageLists(TenantDto tenantDto); } diff --git a/src/main/java/com/pms/ocp/model/dto/GroupDto.java b/src/main/java/com/pms/ocp/model/dto/GroupDto.java new file mode 100644 index 0000000000000000000000000000000000000000..11010a2930e25cc36ed37e471ec8c79669cd8ce4 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/GroupDto.java @@ -0,0 +1,31 @@ +package com.pms.ocp.model.dto; + +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantGroup; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GroupDto extends OcpTenantGroup implements Serializable { + @ApiModelProperty("应用名称") + private String tenantName; + + /** + * 应用代码 + */ + @ApiModelProperty("应用代码") + private String tenantCode; + + /** + * 应用分类代码 + */ + @ApiModelProperty("应用分类代码") + private String tenantGroupCode; +} diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java index e54e22595f59092ad330eb3dd7254ca46e5b6ad3..a7308e3d9445e05545ea971ac031338126381ca5 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenantDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenantDto.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.sql.Timestamp; +import java.util.List; @Data @AllArgsConstructor @@ -57,6 +58,7 @@ public class TenantDto implements Serializable { @ApiModelProperty("每页条数") private Integer pageSize; + private List apiGroupCodeList; // public Integer getApiPromotion() { // return apiPromotion; // } diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 419cc3a4a9a72f1a0b2bfef592a797c96f8eb057..06b0596f8166234b14ab0fac8d8680bf01e1c783 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -2,6 +2,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; +import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.OcpApiGroup; @@ -59,7 +60,7 @@ public interface TenantBasicManagementService extends IService { * @param tenantGroupCompanyCode * @return */ - List tenantBaseTreeOther(String tenantGroupCode,String tenantGroupCompanyCode); + List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode); /** * 应用列表 diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 7d0211ee6da3cd04c6f7cf205d499205ec239f65..817b83728547dae97e516461516f237285bb69ef 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; +import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; @@ -211,9 +212,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) { - List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); + public List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) { + List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); + return ocpTenantGroups; + } /** @@ -230,7 +233,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto); tenantGroup.clear(); PageInfo pageInfo = new PageInfo<>(ocpTenantBaseDto); @@ -251,7 +254,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) { - List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode); + List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode); return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList()); } diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index 43a5bac3757164a1c138a26a41ceeff0d74c266f..da97942e985533735ee805690909947f4bd6d413 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -16,18 +16,25 @@ - +select otb.tenant_name, + otg.tenant_group_code,otg.tenant_group_name,otg.tenant_group_pcode ,otg.tenant_group_level from ocp_tenant_group otg + join ocp_tenant_base otb on otg.tenant_group_code = otb.tenant_group_code + otg.is_delete = 0 + + + - and tenant_group_company_code=#{tenantGroupCompanyCode} + and otg.tenant_group_company_code=#{tenantGroupCompanyCode} + + + and otg.tenant_group_pcode=#{tenantGroupCode} - and tenant_group_pcode=#{tenantGroupCode} + and otb.tenant_group_pcode=#{tenantGroupCode} + + @@ -39,9 +46,19 @@ join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code WHERE otg.is_delete=0 - - and otb.tenant_code = #{tenantCode} + + and otb.tenant_code in + + #{tenantGroupCode} + + + + and otb.tenant_unit = #{apiUnit} + + + and otb.tenant_group_code = #{tenantGroupCode}