Commit e722b580 authored by itcast's avatar itcast

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

parent fb12e76f
...@@ -81,8 +81,8 @@ public class TenantBasicManagementController { ...@@ -81,8 +81,8 @@ public class TenantBasicManagementController {
} }
@ApiOperation("应用树层级") @ApiOperation("应用树层级")
@GetMapping("/tenantBaseTreeOther") @GetMapping("/tenantBaseTreeOther")
public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) { public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) {
List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode); List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode);
return ResponseVO.ok(ocpApiGroups); return ResponseVO.ok(ocpApiGroups);
} }
......
...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper; ...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.OcpTenantBaseDto;
import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.dto.TenantDto;
import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.entity.OcpTenantGroup;
...@@ -12,7 +13,7 @@ import java.util.List; ...@@ -12,7 +13,7 @@ import java.util.List;
@Mapper @Mapper
public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> { public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); List<GroupDto> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode);
List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto); List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
} }
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;
}
...@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
...@@ -57,6 +58,7 @@ public class TenantDto implements Serializable { ...@@ -57,6 +58,7 @@ public class TenantDto implements Serializable {
@ApiModelProperty("每页条数") @ApiModelProperty("每页条数")
private Integer pageSize; private Integer pageSize;
private List<String> apiGroupCodeList;
// public Integer getApiPromotion() { // public Integer getApiPromotion() {
// return apiPromotion; // return apiPromotion;
// } // }
......
...@@ -2,6 +2,7 @@ package com.pms.ocp.service; ...@@ -2,6 +2,7 @@ package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo; 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.OcpTenantBaseDto;
import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.dto.TenantDto;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
...@@ -59,7 +60,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> { ...@@ -59,7 +60,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
* @param tenantGroupCompanyCode * @param tenantGroupCompanyCode
* @return * @return
*/ */
List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupCompanyCode); List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode);
/** /**
* 应用列表 * 应用列表
......
...@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; ...@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.OcpTenantExtentMapper;
import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.OcpTenantGroupMapper;
import com.pms.ocp.mapper.TenantBasicManagementMapper; 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.OcpApiBaseDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.dto.TenantDto;
...@@ -211,9 +212,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -211,9 +212,11 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
* @return * @return
*/ */
@Override @Override
public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) { public List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) {
List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
return ocpTenantGroups; return ocpTenantGroups;
} }
/** /**
...@@ -230,7 +233,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -230,7 +233,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
tenantGroup.add(tenantDto.getTenantGroupCode()); tenantGroup.add(tenantDto.getTenantGroupCode());
setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantGroupCode()); setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantGroupCode());
PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize()); PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize());
tenantDto.setApiGroupCodeList(tenantGroup);
List<OcpTenantBaseDto> ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto); List<OcpTenantBaseDto> ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto);
tenantGroup.clear(); tenantGroup.clear();
PageInfo<OcpTenantBaseDto> pageInfo = new PageInfo<>(ocpTenantBaseDto); PageInfo<OcpTenantBaseDto> pageInfo = new PageInfo<>(ocpTenantBaseDto);
...@@ -251,7 +254,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -251,7 +254,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
} }
public List<String> getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) { public List<String> getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) {
List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode); List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode);
return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList()); return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList());
} }
......
...@@ -16,18 +16,25 @@ ...@@ -16,18 +16,25 @@
</resultMap> </resultMap>
<select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.entity.OcpTenantGroup"> <select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.dto.GroupDto">
select tenant_group_code,tenant_group_name,tenant_group_pcode,tenant_group_level from ocp_tenant_group where select otb.tenant_name,
is_delete = 0 otg.tenant_group_code,otg.tenant_group_name,otg.tenant_group_pcode ,otg.tenant_group_level from ocp_tenant_group otg
<if test="tenantGroupCode == null"> join ocp_tenant_base otb on otg.tenant_group_code = otb.tenant_group_code
and tenant_group_pcode is null otg.is_delete = 0
</if> <!-- <if test="tenantGroupCode == null">-->
<!-- and tenant_group_pcode is null-->
<!-- </if>-->
<if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''"> <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
and tenant_group_company_code=#{tenantGroupCompanyCode} and otg.tenant_group_company_code=#{tenantGroupCompanyCode}
</if>
<if test="tenantGroupCode !=null and tenantGroupCode!=''">
and otg.tenant_group_pcode=#{tenantGroupCode}
</if> </if>
<if test="tenantGroupCode !=null and tenantGroupCode!=''"> <if test="tenantGroupCode !=null and tenantGroupCode!=''">
and tenant_group_pcode=#{tenantGroupCode} and otb.tenant_group_pcode=#{tenantGroupCode}
</if> </if>
</select> </select>
...@@ -39,9 +46,19 @@ ...@@ -39,9 +46,19 @@
join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code 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 join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code
WHERE otg.is_delete=0 WHERE otg.is_delete=0
<if test="tenantCode !=null and tenantCode!=''"> <if test="apiGroupCodeList !=null ">
and otb.tenant_code = #{tenantCode} and otb.tenant_code in
<foreach item="tenantGroupCode" collection="apiGroupCodeList" open="(" separator=","
close=")">
#{tenantGroupCode}
</foreach>
</if>
<if test="tenantUnit !=null and tenantUnit!=''">
and otb.tenant_unit = #{apiUnit}
</if> </if>
<!-- <if test="tenantCode !=null and tenantCode!=''">-->
<!-- and otb.tenant_code = #{tenantCode}-->
<!-- </if>-->
<if test="tenantGroupCode !=null and tenantGroupCode!=''"> <if test="tenantGroupCode !=null and tenantGroupCode!=''">
and otb.tenant_group_code = #{tenantGroupCode} and otb.tenant_group_code = #{tenantGroupCode}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment