From d89a3f87e5433693ba0baee6b3268fe55ae4e7cc Mon Sep 17 00:00:00 2001 From: itcast Date: Mon, 14 Mar 2022 14:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=93=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 9 ---- .../TenantBasicManagementController.java | 14 +++-- .../pms/ocp/mapper/OcpTenantGroupMapper.java | 2 +- .../mapper/TenantBasicManagementMapper.java | 6 ++- .../com/pms/ocp/model/entity/PmsCompany.java | 51 +++++++++++++++++++ .../com/pms/ocp/model/vo/CompanyTenantVo.java | 20 ++++++++ .../java/com/pms/ocp/model/vo/CompanyVo.java | 16 ++++++ .../com/pms/ocp/model/vo/TenantGroupVo.java | 15 ++++++ .../service/TenantBasicManagementService.java | 7 +-- .../impl/ApiBasicManagementServiceImpl.java | 8 --- .../TenantBasicManagementServiceImpl.java | 15 ++---- src/main/resources/mapper/OcpGroup.xml | 25 ++++----- .../mapper/TenantBasicManagementMapper.xml | 27 ++++++---- 13 files changed, 147 insertions(+), 68 deletions(-) create mode 100644 src/main/java/com/pms/ocp/model/entity/PmsCompany.java create mode 100644 src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java create mode 100644 src/main/java/com/pms/ocp/model/vo/CompanyVo.java create mode 100644 src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 5bdbf36..d7acbc5 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -188,7 +188,6 @@ public class ApiBasicManagementController { return apiBasicManagementService.apiIssue(apiCodes); } - } @ApiOperation("服务列表") @@ -210,12 +209,4 @@ public class ApiBasicManagementController { List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } - - -// @PostMapping("/apiTree") -// @ApiOperation("服务列表2") -// public ResponseVO queryTreeData(@RequestBody WholeLinkParamDto wholeLinkParamDto) { -// return apiBasicManagementService.queryApiTreeData(wholeLinkParamDto); -// } - } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 91e6c04..9f9fe39 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -1,13 +1,16 @@ package com.pms.ocp.controller; +import com.baomidou.mybatisplus.extension.api.R; import com.github.pagehelper.PageInfo; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.model.vo.Menu; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantBasicManagementService; import com.pms.ocp.service.TenantService; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; @@ -30,6 +33,7 @@ public class TenantBasicManagementController { @Autowired private TenantService tenantService; + @ApiOperation("条件查询") @GetMapping("/queryOcpTenantBaseDto") public ResponseVO> queryOcpTenantBaseDto( @@ -89,19 +93,13 @@ public class TenantBasicManagementController { } @ApiOperation("应用列表") - @GetMapping("/tenantListQuery") + @GetMapping("/tenantListQuery") public ResponseVO> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) { - return tenantBasicManagementService.getBaseByGroupCode(tenantDto); } - @ApiOperation("应用树层级2") - @GetMapping("/baseTreeOther") - public ResponseVO> baseTreeOther(@RequestParam(required = false) String tenantGroupCode) { - List list = tenantBasicManagementService.baseTreeOther(tenantGroupCode); - return ResponseVO.ok(list); - } + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index 7e9071b..e9a7eff 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -18,5 +18,5 @@ public interface OcpTenantGroupMapper extends BaseMapper { List selectPageLists(TenantDto tenantDto); - List selectAll(); + } diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java index 3fd5600..5bbf40c 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java @@ -4,6 +4,8 @@ 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.entity.OcpTenantBase; +import com.pms.ocp.model.vo.CompanyVo; +import com.pms.ocp.model.vo.TenantGroupVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +16,9 @@ import java.util.List; public interface TenantBasicManagementMapper extends BaseMapper { - List queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum); +// List queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum); List select(String tenantGroupCode); + + List queryOcpTenantBaseDto(String tenantGroupCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, String tenantCode, Integer pageSize, Integer pageNum); } diff --git a/src/main/java/com/pms/ocp/model/entity/PmsCompany.java b/src/main/java/com/pms/ocp/model/entity/PmsCompany.java new file mode 100644 index 0000000..6a288c1 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsCompany.java @@ -0,0 +1,51 @@ +package com.pms.ocp.model.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 服务表(PmsZyApi)实体类 + * + * @author wangsufu + * @since 2022-01-04 20:46:09 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@TableName("pms_company") +@ApiModel(value = "PMS网省公司表", description = "PMS网省公司表") +public class PmsCompany implements Serializable { + private static final long serialVersionUID = -79779908395545838L; + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "公司名称") + private String companyName; + + @ApiModelProperty(value = "公司代码") + private String companyCode; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "公司名称简写") + private String companyShortName; + + @ApiModelProperty(value = "公司层级") + private String companyLevel; + + @ApiModelProperty(value = "公司排序") + private Integer companySort; + + +} + diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java new file mode 100644 index 0000000..6ecea36 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java @@ -0,0 +1,20 @@ +package com.pms.ocp.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +@ApiModel(value = "网省公司Vo", description = "网省公司Vo") +public class CompanyTenantVo { + @ApiModelProperty(value = "公司名称") + private String companyName; + @ApiModelProperty(value = "公司code") + private String companyCode; + @ApiModelProperty(value = "应用名称") + private String tenantName; + @ApiModelProperty(value = "应用code") + private String tenantCode; +} diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyVo.java new file mode 100644 index 0000000..246b408 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/CompanyVo.java @@ -0,0 +1,16 @@ +package com.pms.ocp.model.vo; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@ApiModel(value = "网省公司Vo", description = "网省公司Vo") +public class CompanyVo implements Serializable { + private String companyName; + private String companyCode; +} + diff --git a/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java b/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java new file mode 100644 index 0000000..f1d21d2 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java @@ -0,0 +1,15 @@ +package com.pms.ocp.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "网省公司Vo", description = "网省公司Vo") +public class TenantGroupVo { + @ApiModelProperty(value = "应用组code") + private String tenantGroupCode; + @ApiModelProperty(value = "应用组名称") + private String tenantGroupName; + +} diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index be3980d..c5f3883 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -5,6 +5,7 @@ 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.dto.WholeLinkParamDto; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; @@ -68,12 +69,6 @@ public interface TenantBasicManagementService extends IService { * @return */ ResponseVO> getBaseByGroupCode(TenantDto tenantDto); - /** - * 应用树 - * @param tenantGroupCode - * @return - */ - List baseTreeOther(String tenantGroupCode); diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index ce232bb..fdf6ac7 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -114,14 +114,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); -// pageSize = (pageSize - 1) * pageNum; -// OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnits, startTime, endTime, apiCode, pageSize, pageNum); -// return ocpApiBaseDto; -// } - /** * 导入添加到数据库 * 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 77b9140..58f903a 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -11,8 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper; 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.dto.WholeLinkParamDto; import com.pms.ocp.model.entity.*; +import com.pms.ocp.model.vo.CompanyTenantVo; +import com.pms.ocp.model.vo.CompanyVo; import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.model.vo.TenantGroupVo; import com.pms.ocp.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -247,16 +251,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl baseTreeOther(String tenantGroupCode) { - List group = null; - if (StringUtils.isBlank(tenantGroupCode)) { - group= ocpTenantGroupMapper.selectAll(); - } else { - group= tenantBasicManagementMapper.select(tenantGroupCode); - } - return group; - } + diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index a41b1d2..ddaaa43 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -17,17 +17,19 @@ - diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml index 94eb3f3..e42ae69 100644 --- a/src/main/resources/mapper/TenantBasicManagementMapper.xml +++ b/src/main/resources/mapper/TenantBasicManagementMapper.xml @@ -3,16 +3,16 @@ - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file -- 2.26.0