From 760df5fe7c907792a564237880a0e595e65bbb5c Mon Sep 17 00:00:00 2001 From: itcast Date: Sat, 12 Mar 2022 18:35:26 +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 --- .../com/pms/ocp/common/utils/MenuTree.java | 46 ++++++ .../ApiBasicManagementController.java | 12 +- .../TenantBasicManagementController.java | 37 +++-- .../com/pms/ocp/mapper/OcpApiGroupMapper.java | 3 + .../pms/ocp/mapper/OcpTenantGroupMapper.java | 4 + .../com/pms/ocp/model/dto/ApiBaseDto.java | 2 +- .../java/com/pms/ocp/model/dto/TenantDto.java | 155 ++++++++++++++++++ .../pms/ocp/model/dto/WholeLinkParamDto.java | 22 +++ .../pms/ocp/model/entity/OcpTenantSubs.java | 10 +- src/main/java/com/pms/ocp/model/vo/Menu.java | 31 ++++ .../com/pms/ocp/model/vo/WholeLinkTreeVo.java | 30 ++++ .../service/ApiBasicManagementService.java | 8 + .../service/TenantBasicManagementService.java | 15 +- .../impl/ApiBasicManagementServiceImpl.java | 28 +++- .../TenantBasicManagementServiceImpl.java | 79 ++++++++- .../resources/mapper/OcpApiGroupMapper.xml | 5 + src/main/resources/mapper/OcpGroup.xml | 55 ++++++- 17 files changed, 503 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/pms/ocp/common/utils/MenuTree.java create mode 100644 src/main/java/com/pms/ocp/model/dto/TenantDto.java create mode 100644 src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java create mode 100644 src/main/java/com/pms/ocp/model/vo/Menu.java create mode 100644 src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java diff --git a/src/main/java/com/pms/ocp/common/utils/MenuTree.java b/src/main/java/com/pms/ocp/common/utils/MenuTree.java new file mode 100644 index 0000000..59df4b1 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/utils/MenuTree.java @@ -0,0 +1,46 @@ +package com.pms.ocp.common.utils; + +import com.pms.ocp.model.vo.Menu; + +import java.util.ArrayList; +import java.util.List; + +public class MenuTree { + private List menuList = new ArrayList(); + public MenuTree(List menuList) { + this.menuList=menuList; + } + + //建立树形结构 + public List builTree(){ + List treeMenus =new ArrayList(); + for(Menu menuNode : getRootNode()) { + menuNode=buildChilTree(menuNode); + treeMenus.add(menuNode); + } + return treeMenus; + } + + //递归，建立子树形结构 + private Menu buildChilTree(Menu pNode){ + List chilMenus =new ArrayList(); + for(Menu menuNode : menuList) { + if(menuNode.getParentId().equals(pNode.getId())) { + chilMenus.add(buildChilTree(menuNode)); + } + } + pNode.setChildren(chilMenus); + return pNode; + } + + //获取根节点 + private List getRootNode() { + List rootMenuLists =new ArrayList(); + for(Menu menuNode : menuList) { + if("0".equals(menuNode.getParentId())) { + rootMenuLists.add(menuNode); + } + } + return rootMenuLists; + } +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index b4adf8d..30be945 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -9,6 +9,7 @@ import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.OcpApiBaseDto; +import com.pms.ocp.model.dto.WholeLinkParamDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; @@ -16,11 +17,12 @@ import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.ApiDetailsService; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.omg.PortableInterceptor.Interceptor; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -41,6 +43,7 @@ public class ApiBasicManagementController { @Autowired private ApiBasicManagementService apiBasicManagementService; + @ApiOperation("条件查询") @GetMapping("/queryOcpApiBaseDto") public ResponseVO> queryOcpApiBaseDto(@RequestParam(required = false) String apiCode, @@ -208,4 +211,11 @@ public class ApiBasicManagementController { 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 1aa7a7b..7640060 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -1,10 +1,10 @@ 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.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.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantBasicManagementService; import com.pms.ocp.service.TenantService; @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.List; @@ -47,25 +48,20 @@ public class TenantBasicManagementController { @ApiOperation("应用发布") @PostMapping("/issue") - public ResponseVO TenantIssue(@RequestParam(required = false) String tenantPromotion, + public ResponseVO TenantIssue( @RequestParam(required = false) String tenantCodes) { -// 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 { - tenantBasicManagementService.tenantLogin(tenantCodes); - return ResponseVO.ok(); -// } + public ResponseVO TenantLogin( + @RequestParam(required = false) String tenantCodes, + @RequestParam(required = false) String companyCode) { + + return tenantBasicManagementService.tenantLogin(tenantCodes,companyCode); + } @@ -84,11 +80,18 @@ public class TenantBasicManagementController { } @ApiOperation("应用树层级") - @GetMapping("/apiBaseTreeOther") + @GetMapping("/tenantBaseTreeOther") public ResponseVO> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) { List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode); return ResponseVO.ok(ocpApiGroups); } + @ApiOperation("应用列表") + @GetMapping("/tenantListQuery") + public ResponseVO> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) { + + return tenantBasicManagementService.getBaseByGroupCode(tenantDto); + } + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java index 5225c4d..7b68d58 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java @@ -5,6 +5,7 @@ import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; +import com.pms.ocp.model.vo.WholeLinkTreeVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -19,4 +20,6 @@ public interface OcpApiGroupMapper extends BaseMapper { List selectByPcode(String code); List selectPageLists(ApiBaseDto apiBaseReq); + +// List queryApiTreeData1(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index 3a6586b..4d26a75 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -2,6 +2,8 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.OcpTenantGroup; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,4 +13,6 @@ import java.util.List; @Mapper public interface OcpTenantGroupMapper extends BaseMapper { List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupPcode") String tenantGroupPcode); + + List selectPageLists(TenantDto tenantDto); } diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index a26de17..4d4bc0f 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @Data @AllArgsConstructor @NoArgsConstructor -@ApiModel("应用列表查询参数") +@ApiModel("服务列表查询参数") public class ApiBaseDto implements Serializable { @ApiModelProperty("服务编码") diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java new file mode 100644 index 0000000..e54e225 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/TenantDto.java @@ -0,0 +1,155 @@ +package com.pms.ocp.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.sql.Timestamp; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ApiModel("服务列表查询参数") +public class TenantDto implements Serializable { + + @ApiModelProperty("应用编码") + private String tenantCode; + + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; + + @ApiModelProperty("应用分类公司") + private String tenantGroupCompanyCode; + + @ApiModelProperty("建设单位") + private String tenantUnit; + +// @ApiModelProperty("推广类型0:统建；1:自建") +// private Integer apiPromotion; + + @ApiModelProperty("注册时段-开始") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Timestamp startTime; + + @ApiModelProperty("注册时段-结束") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Timestamp endTime; + + @ApiModelProperty("注册开始") + private String startCTime; + + @ApiModelProperty("注册结束") + private String endCTime; + + @ApiModelProperty("关键字") + private String keyword; + + @ApiModelProperty("当前页") + private Integer pageNum; + + @ApiModelProperty("每页条数") + private Integer pageSize; + +// public Integer getApiPromotion() { +// return apiPromotion; +// } +// +// public void setApiPromotion(Integer apiPromotion) { +// this.apiPromotion = apiPromotion; +// } + + public String getTenantCode() { + return tenantCode; + } + + public void setTenantCode(String tenantCode) { + this.tenantCode = tenantCode; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantUnit() { + return tenantUnit; + } + + public void setTenantUnit(String tenantUnit) { + this.tenantUnit = tenantUnit; + } + + public Timestamp getStartTime() { + return startTime; + } + + public void setStartTime(Timestamp startTime) { + this.startTime = startTime; + } + + public Timestamp getEndTime() { + return endTime; + } + + public void setEndTime(Timestamp endTime) { + this.endTime = endTime; + } + + public String getStartCTime() { + return startCTime; + } + + public void setStartCTime(String startCTime) { + this.startCTime = startCTime; + } + + public String getEndCTime() { + return endCTime; + } + + public void setEndCTime(String endCTime) { + this.endCTime = endCTime; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java b/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java new file mode 100644 index 0000000..3b24fe0 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java @@ -0,0 +1,22 @@ +package com.pms.ocp.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@ApiModel(value = "全链路拓扑图传输参数") +@Data +public class WholeLinkParamDto implements Serializable { + @ApiModelProperty(value = "开始时间") + private String beginTime; + @ApiModelProperty(value = "结束时间") + private String endTime; + @ApiModelProperty(value = "服务code") + private String apiCode; + @ApiModelProperty(value = "应用code") + private String tenantCode; + @ApiModelProperty(value = "公司code") + private String companyCode; +} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java index b0451de..93993ec 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java @@ -143,11 +143,11 @@ public class OcpTenantSubs implements Serializable { */ @ApiModelProperty("应用状态0:设计态；1:运行态") private Short tenantState; - /** - * 推广类型0:统建；1:自建 - */ - @ApiModelProperty("推广类型0:统建；1:自建") - private long tenantPromotion; +// /** +// * 推广类型0:统建；1:自建 +// */ +// @ApiModelProperty("推广类型0:统建；1:自建") +// private long tenantPromotion; /** * 建设单位 */ diff --git a/src/main/java/com/pms/ocp/model/vo/Menu.java b/src/main/java/com/pms/ocp/model/vo/Menu.java new file mode 100644 index 0000000..f824261 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/Menu.java @@ -0,0 +1,31 @@ +package com.pms.ocp.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ApiModel(value = "菜单栏目Vo", description = "菜单栏目Vo") +public class Menu implements Serializable { + @ApiModelProperty(value = "id") + private String id; + @ApiModelProperty(value = "parentId") + private String parentId; + @ApiModelProperty(value = "内容") + private String text; + @ApiModelProperty(value = "类型") + private String type; + @ApiModelProperty(value = "子集") + private List children; + public Menu() { + this.id=id; + this.parentId=parentId; + this.text=text; + this.type=type; + + } + +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java b/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java new file mode 100644 index 0000000..da8dc6d --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java @@ -0,0 +1,30 @@ +package com.pms.ocp.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@ApiModel(value = "全链路拓扑图树信息", description = "全链路拓扑图树信息") +public class WholeLinkTreeVo implements Serializable { +// @ApiModelProperty(value = "推广类型(0-统建,1-自建)") +// private String apiPromotion; + + @ApiModelProperty(value = "服务分类code") + private String apiGroupCode; + + @ApiModelProperty(value = "服务分类名称") + private String apiGroupName; + + @ApiModelProperty(value = "服务分类父节点code") + private String apiGroupPcode; + + @ApiModelProperty(value = "推广类型") + private String apiGroupPromotionType; + + +} diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 8112c2e..f5ac1f0 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -6,6 +6,7 @@ import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.OcpApiBaseDto; +import com.pms.ocp.model.dto.WholeLinkParamDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; @@ -88,4 +89,11 @@ public interface ApiBasicManagementService extends IService { * @return */ List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); + +// /** +// * 服务列表2 +// * @param wholeLinkParamDto +// * @return +// */ +// ResponseVO queryApiTreeData(WholeLinkParamDto wholeLinkParamDto); } diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index e9d5d7b..ea6614d 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -1,10 +1,13 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.dto.TenantDto; 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.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; @@ -35,11 +38,12 @@ public interface TenantBasicManagementService extends IService { * 应用订阅 * @param tenantCodes */ - void tenantLogin(String tenantCodes); + ResponseVO tenantLogin(String tenantCodes,String companyCode); /** - * 应用下线 + * 下线 * @param tenantCodes + * @return */ ResponseVO tenantCancel(String tenantCodes); @@ -56,4 +60,11 @@ public interface TenantBasicManagementService extends IService { * @return */ List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode); + + /** + * 应用列表 + * @param tenantDto + * @return + */ + ResponseVO> getBaseByGroupCode(TenantDto tenantDto); } 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 5160514..a5dca36 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -10,6 +10,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pms.ocp.common.constants.StringUtils; import com.pms.ocp.common.exception.BeagleException; +import com.pms.ocp.common.utils.MenuTree; import com.pms.ocp.mapper.ApiBasicManagementMapper; import com.pms.ocp.mapper.OcpApiExtentMapper; import com.pms.ocp.mapper.OcpApiGroupMapper; @@ -18,13 +19,12 @@ import com.pms.ocp.model.CommonCode; import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.dto.OcpApiBaseDto; +import com.pms.ocp.model.dto.WholeLinkParamDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.OcpModelGroupVO; -import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.model.vo.*; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; @@ -216,6 +216,28 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiTreeDataList = ocpApiGroupMapper.queryApiTreeData1(); +// List list = new ArrayList<>(); +// for (WholeLinkTreeVo wholeLinkTreeVo : apiTreeDataList) { +// Menu menu = new Menu(); +// menu.setId(wholeLinkTreeVo.getApiGroupCode()); +// menu.setParentId(wholeLinkTreeVo.getApiGroupPcode()); +// menu.setText(wholeLinkTreeVo.getApiGroupName()); +// menu.setType(wholeLinkTreeVo.getApiGroupPromotionType()); +// list.add(menu); +// } +// MenuTree menuTree = new MenuTree(list); +// list = menuTree.builTree(); +// return ResponseVO.ok(list); +// } + /** * 分组权限分组使用in查询 * 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 b97ff24..6f09982 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -3,12 +3,16 @@ package com.pms.ocp.service.impl; 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.github.pagehelper.PageHelper; +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.OcpApiBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.*; +import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.*; import org.apache.commons.lang3.StringUtils; @@ -19,8 +23,10 @@ import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; @Service public class TenantBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { @@ -37,6 +43,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantGroupCode = new ArrayList<>(); + /** * 条件查询 * @@ -63,6 +71,9 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -85,18 +96,26 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantCode = Arrays.asList(split); for (String s : tenantCode) { OcpTenantSubs ocpTenantSubs = new OcpTenantSubs(); ocpTenantSubs.setTenantCode(s); - ocpTenantSubs.setSubsCompanyCode(null); + ocpTenantSubs.setSubsCompanyCode(companyCode); ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now())); ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now())); ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now())); + ocpTenantSubs.setIsDelete((short) 0); ocpTenantSubsService.save(ocpTenantSubs); } + return ResponseVO.ok("订阅成功"); } /** @@ -106,20 +125,29 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); + for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { +// if (ocpTenantExtent == null) { +// return ResponseVO.error("未知错误"); +// } if (ocpTenantExtent.getTenantState() == 2) { return ResponseVO.error("已下线"); } else { ocpTenantExtent.setTenantState((short) 2); ocpTenantExtentMapper.updateById(ocpTenantExtent); } + } - return ResponseVO.ok(); + return ResponseVO.ok("操作成功"); } /** @@ -184,8 +212,51 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) { - List ocpTenantGroups=ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode); + List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupPcode); return ocpTenantGroups; } + /** + * 应用列表 + * + * @param tenantDto + * @return + */ + @Override + public ResponseVO> getBaseByGroupCode(TenantDto tenantDto) { + if (tenantDto.getPageNum() == null || tenantDto.getPageSize() == null) { + ResponseVO.error("分页参数不能为空"); + } + tenantGroupCode.add(tenantDto.getTenantCode()); + setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantCode()); + PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize()); + + List ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto); + tenantGroupCode.clear(); + PageInfo pageInfo = new PageInfo<>(ocpTenantBaseDto); + return ResponseVO.ok(pageInfo); + +// List ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); +// tenantGroupCode.clear(); +// PageInfo pageInfo = new PageInfo<>(ocpApiBaseVos); +// return ResponseVO.ok(pageInfo); + } + + private void setGroupIdValue(String apiGroupCompanyCode, String code) { + List codes = getIdsByPIdPub(apiGroupCompanyCode, code); + if (codes.size() > 0) { + for (String cod : codes) { + setGroupIdValue(apiGroupCompanyCode, cod); + tenantGroupCode.add(cod); + } + ; + } + + } + + public List getIdsByPIdPub(String apiGroupCompanyCode, String code) { + List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(apiGroupCompanyCode, code); + return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList()); + } + } diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 0b43e7f..fe1bdd7 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -79,4 +79,9 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index e713c1d..334d22f 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -1,19 +1,62 @@ + + + + + + + + + + + + + + + + + + + + = #{startCTime} + ]]> + + + + + + and otb.tenant_name like CONCAT('%', #{keyword}::text,'%') + + + and otb.tenant_code like CONCAT('%', #{keyword}::text,'%') + + -- 2.26.0