Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
67f62c47
Commit
67f62c47
authored
Mar 13, 2022
by
zhaochengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
赵呈明 --应用树
parent
668e68ee
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
170 additions
and
419 deletions
+170
-419
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
...ain/java/com/pms/ocp/controller/OcpApiTreeController.java
+2
-8
src/main/java/com/pms/ocp/controller/OcpTenantController.java
...main/java/com/pms/ocp/controller/OcpTenantController.java
+13
-21
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
+16
-0
src/main/java/com/pms/ocp/mapper/TenantMapper.java
src/main/java/com/pms/ocp/mapper/TenantMapper.java
+16
-4
src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java
src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java
+6
-28
src/main/java/com/pms/ocp/model/dto/OneTenanList.java
src/main/java/com/pms/ocp/model/dto/OneTenanList.java
+0
-213
src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java
src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java
+1
-1
src/main/java/com/pms/ocp/model/dto/TwoTenanList.java
src/main/java/com/pms/ocp/model/dto/TwoTenanList.java
+1
-1
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
+2
-2
src/main/java/com/pms/ocp/service/TenantService.java
src/main/java/com/pms/ocp/service/TenantService.java
+19
-17
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
.../java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+30
-14
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
...main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+28
-107
src/main/resources/mapper/OcpApiTreeMapper.xml
src/main/resources/mapper/OcpApiTreeMapper.xml
+19
-0
src/main/resources/mapper/OcpTenantGroup.xml
src/main/resources/mapper/OcpTenantGroup.xml
+17
-3
No files found.
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
View file @
67f62c47
...
...
@@ -34,8 +34,8 @@ public class OcpApiTreeController {
*/
@GetMapping
(
"/getTree"
)
@ApiOperation
(
"服务树分类"
)
public
ResponseVO
<
ApiTreeGroupDto
>
getTree
(
){
ApiTreeGroupDto
byGroup
=
service
.
getByGroup
(
);
public
ResponseVO
<
List
<
OcpApiGroup
>>
getTree
(
String
apiGroupPromotionType
,
String
apiGroupCode
){
List
<
OcpApiGroup
>
byGroup
=
service
.
getByGroup
(
apiGroupPromotionType
,
apiGroupCode
);
return
ResponseVO
.
ok
(
byGroup
);
}
...
...
@@ -81,10 +81,4 @@ public class OcpApiTreeController {
}
}
src/main/java/com/pms/ocp/controller/OcpTenantController.java
View file @
67f62c47
...
...
@@ -2,9 +2,7 @@ package com.pms.ocp.controller;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.pms.ocp.model.dto.PageOcpTenantDto
;
import
com.pms.ocp.model.dto.OcpTenantGroupDto
;
import
com.pms.ocp.model.dto.TenanBaseDto
;
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.ResponseVO
;
...
...
@@ -17,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.Set
;
@Slf4j
...
...
@@ -28,14 +27,21 @@ public class OcpTenantController {
@Autowired
private
TenantService
tenantService
;
/**
* 应用树分类
* @return
*/
@GetMapping
(
"/tenanttree"
)
@GetMapping
(
"/tenantOnetree"
)
@ApiModelProperty
(
"应用树分类"
)
private
OcpTenantGroupDto
getTenantTree
(){
OcpTenantGroupDto
tree
=
tenantService
.
getTree
();
private
List
<
OcpTenantGroup
>
getTenantTree
(
OcpTenantGroup
ocpTenantGroup
)
{
List
<
OcpTenantGroup
>
tree
=
tenantService
.
getTree
(
ocpTenantGroup
.
getTenantGroupCompanyCode
(),
ocpTenantGroup
.
getTenantGroupCode
());
return
tree
;
}
@GetMapping
(
"/tenantselect"
)
@ApiModelProperty
(
"应用树分类--查询"
)
private
Page
<
OcpTenantGroup
>
getselect
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
,
int
currentPage
,
int
pageSize
){
Page
<
OcpTenantGroup
>
tree
=
tenantService
.
getselects
(
tenantGroupCode
,
tenantGroupCompanyCode
,
currentPage
,
pageSize
);
return
tree
;
}
...
...
@@ -70,20 +76,6 @@ public class OcpTenantController {
}
@PostMapping
(
"tenantuse"
)
@ApiOperation
(
"应用分类--应用管理"
)
public
ResponseVO
<
List
<
OcpTenantGroup
>>
tenantUse
(
@RequestBody
PageOcpTenantDto
ocpTenantDto
){
List
<
OcpTenantGroup
>
onePages
=
tenantService
.
getsUse
(
ocpTenantDto
);
return
ResponseVO
.
ok
(
onePages
);
}
@PostMapping
(
"tenantcase"
)
@ApiOperation
(
"应用分类--应用服务分页查"
)
public
ResponseVO
<
Page
<
OcpTenantGroup
>>
tenantCase
(
@RequestBody
PageOcpTenantDto
pageOcpTenantDto
){
Page
<
OcpTenantGroup
>
pages
=
tenantService
.
getOnePages
(
pageOcpTenantDto
);
return
ResponseVO
.
ok
(
pages
);
}
...
...
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
View file @
67f62c47
...
...
@@ -14,4 +14,20 @@ import java.util.List;
@Mapper
public
interface
OcpApiTreeMapper
extends
BaseMapper
<
OcpApiGroup
>
{
/**
* 一级树
* @return
*/
List
<
OcpApiGroup
>
selectApiGroups
();
/**
* 二级树
* @param apiGroupPromotionType
* @return
*/
List
<
OcpApiGroup
>
selectTwoApiGroups
(
String
apiGroupPromotionType
);
//三级数
List
<
OcpApiGroup
>
selectThreeApiGroupsList
(
String
apiGroupPromotionType
,
String
apiGroupCode
);
}
src/main/java/com/pms/ocp/mapper/TenantMapper.java
View file @
67f62c47
...
...
@@ -11,12 +11,24 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
/**
*
* @param
tenantGroupCompanyCode
*
应用一级查询顶级服务
* @param
* @return
*/
OcpTenantGroup
oneTenantGroup
(
String
tenantGroupCompanyCode
);
List
<
OcpTenantGroup
>
oneTenantGroup
();
//二级目录树
List
<
OcpTenantGroup
>
twoTenantGroups
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
);
List
<
OcpTenantGroup
>
selectTenantGroups
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
);
List
<
OcpTenantGroup
>
selectTenantGroup
(
String
tenantGroupCompanyCode
);
List
<
OcpTenantGroup
>
selectGroups
(
String
tenantGroupCompanyCode
);
List
<
OcpTenantGroup
>
twoTenantGroups
(
String
tenantGroupCompanyPCode
);
}
src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java
View file @
67f62c47
package
com.pms.ocp.model.dto
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -13,36 +14,13 @@ import java.util.Set;
public
class
OcpTenantGroupDto
{
@ApiModelProperty
(
"创建公司"
)
private
Set
<
String
>
one
List
;
private
List
<
OcpTenantGroup
>
List
;
@ApiModelProperty
(
"应用管理"
)
private
List
<
TwoTenanList
>
twoList
;
@ApiModelProperty
(
"应用层"
)
private
List
<
ThreeTenanList
>
ThreeList
;
public
Set
<
String
>
getOneList
()
{
return
oneList
;
}
public
void
setOneList
(
Set
<
String
>
oneList
)
{
this
.
oneList
=
oneList
;
}
public
List
<
TwoTenanList
>
getTwoList
()
{
return
twoList
;
}
public
void
setTwoList
(
List
<
TwoTenanList
>
twoList
)
{
this
.
twoList
=
twoList
;
}
public
List
<
ThreeTenanList
>
getThreeList
()
{
return
ThreeList
;
public
java
.
util
.
List
<
OcpTenantGroup
>
getList
()
{
return
List
;
}
public
void
set
ThreeList
(
List
<
ThreeTenanList
>
threeL
ist
)
{
ThreeList
=
threeL
ist
;
public
void
set
List
(
java
.
util
.
List
<
OcpTenantGroup
>
l
ist
)
{
List
=
l
ist
;
}
}
src/main/java/com/pms/ocp/model/dto/OneTenanList.java
deleted
100644 → 0
View file @
668e68ee
package
com.pms.ocp.model.dto
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
@EqualsAndHashCode
(
callSuper
=
false
)
@ApiModel
(
value
=
"一级创建公司"
)
@Data
public
class
OneTenanList
{
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ApiModelProperty
(
"主键"
)
private
String
objId
;
/**
* 应用分类编码
*/
@ApiModelProperty
(
"应用分类编码"
)
private
String
tenantGroupCode
;
/**
* 应用分类名称
*/
@ApiModelProperty
(
"应用分类名称"
)
private
String
tenantGroupName
;
/**
* 分类创建公司
*/
@ApiModelProperty
(
"分类创建公司"
)
private
String
tenantGroupCompanyCode
;
/**
* 上级code
*/
@ApiModelProperty
(
"上级code"
)
private
String
tenantGroupPcode
;
/**
* 应用类别设备级、生态级等
*/
@ApiModelProperty
(
"应用类别设备级、生态级等"
)
private
String
tenantType
;
/**
* 分类版本
*/
@ApiModelProperty
(
"分类版本"
)
private
String
tenantGroupVersion
;
/**
* 显示顺序
*/
@ApiModelProperty
(
"显示顺序"
)
private
Integer
tenantGroupOrderNo
;
/**
* 提交人id
*/
@ApiModelProperty
(
"提交人id"
)
private
String
tenantGroupUserId
;
/**
* 提交人姓名
*/
@ApiModelProperty
(
"提交人姓名"
)
private
String
tenantGroupUserName
;
/**
* 创建时间
*/
@ApiModelProperty
(
"创建时间"
)
private
Date
tenantGroupCtime
;
/**
* 修改时间
*/
@ApiModelProperty
(
"修改时间"
)
private
Date
tenantGroupMtime
;
/**
* 是否删除
*/
@ApiModelProperty
(
"是否删除"
)
private
Short
isDelete
;
/**
* 应用树层级 1:应用分组层 2:应用层
*/
@ApiModelProperty
(
"应用树层级 1:应用分组层 2:应用层"
)
private
Short
tenantGroupLevel
;
public
String
getObjId
()
{
return
objId
;
}
public
void
setObjId
(
String
objId
)
{
this
.
objId
=
objId
;
}
public
String
getTenantGroupCode
()
{
return
tenantGroupCode
;
}
public
void
setTenantGroupCode
(
String
tenantGroupCode
)
{
this
.
tenantGroupCode
=
tenantGroupCode
;
}
public
String
getTenantGroupName
()
{
return
tenantGroupName
;
}
public
void
setTenantGroupName
(
String
tenantGroupName
)
{
this
.
tenantGroupName
=
tenantGroupName
;
}
public
String
getTenantGroupCompanyCode
()
{
return
tenantGroupCompanyCode
;
}
public
void
setTenantGroupCompanyCode
(
String
tenantGroupCompanyCode
)
{
this
.
tenantGroupCompanyCode
=
tenantGroupCompanyCode
;
}
public
String
getTenantGroupPcode
()
{
return
tenantGroupPcode
;
}
public
void
setTenantGroupPcode
(
String
tenantGroupPcode
)
{
this
.
tenantGroupPcode
=
tenantGroupPcode
;
}
public
String
getTenantType
()
{
return
tenantType
;
}
public
void
setTenantType
(
String
tenantType
)
{
this
.
tenantType
=
tenantType
;
}
public
String
getTenantGroupVersion
()
{
return
tenantGroupVersion
;
}
public
void
setTenantGroupVersion
(
String
tenantGroupVersion
)
{
this
.
tenantGroupVersion
=
tenantGroupVersion
;
}
public
Integer
getTenantGroupOrderNo
()
{
return
tenantGroupOrderNo
;
}
public
void
setTenantGroupOrderNo
(
Integer
tenantGroupOrderNo
)
{
this
.
tenantGroupOrderNo
=
tenantGroupOrderNo
;
}
public
String
getTenantGroupUserId
()
{
return
tenantGroupUserId
;
}
public
void
setTenantGroupUserId
(
String
tenantGroupUserId
)
{
this
.
tenantGroupUserId
=
tenantGroupUserId
;
}
public
String
getTenantGroupUserName
()
{
return
tenantGroupUserName
;
}
public
void
setTenantGroupUserName
(
String
tenantGroupUserName
)
{
this
.
tenantGroupUserName
=
tenantGroupUserName
;
}
public
Date
getTenantGroupCtime
()
{
return
tenantGroupCtime
;
}
public
void
setTenantGroupCtime
(
Date
tenantGroupCtime
)
{
this
.
tenantGroupCtime
=
tenantGroupCtime
;
}
public
Date
getTenantGroupMtime
()
{
return
tenantGroupMtime
;
}
public
void
setTenantGroupMtime
(
Date
tenantGroupMtime
)
{
this
.
tenantGroupMtime
=
tenantGroupMtime
;
}
public
Short
getIsDelete
()
{
return
isDelete
;
}
public
void
setIsDelete
(
Short
isDelete
)
{
this
.
isDelete
=
isDelete
;
}
public
Short
getTenantGroupLevel
()
{
return
tenantGroupLevel
;
}
public
void
setTenantGroupLevel
(
Short
tenantGroupLevel
)
{
this
.
tenantGroupLevel
=
tenantGroupLevel
;
}
}
src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java
View file @
67f62c47
...
...
@@ -14,7 +14,7 @@ import java.util.Date;
@ApiModel
(
value
=
"三级应用"
)
@Data
public
class
ThreeTenanList
{
//3
/**
* 主键
...
...
src/main/java/com/pms/ocp/model/dto/TwoTenanList.java
View file @
67f62c47
...
...
@@ -15,7 +15,7 @@ import java.util.Date;
@ApiModel
(
value
=
"二级应用管理"
)
@Data
public
class
TwoTenanList
{
//1
/**
* 主键
...
...
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
View file @
67f62c47
...
...
@@ -8,7 +8,7 @@ import com.pms.ocp.model.dto.OcpApiGroupDtos;
import
com.pms.ocp.model.dto.PageGroupDto
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
java.util.List
;
public
interface
OcpApiTreeService
extends
IService
<
OcpApiGroup
>
{
...
...
@@ -16,7 +16,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
/**
* 服务树分类
*/
ApiTreeGroupDto
getByGroup
(
);
List
<
OcpApiGroup
>
getByGroup
(
String
apiGroupPromotionType
,
String
apiGroupCode
);
/**
* 新增服务分类
...
...
src/main/java/com/pms/ocp/service/TenantService.java
View file @
67f62c47
...
...
@@ -3,26 +3,20 @@ package com.pms.ocp.service;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.pms.ocp.model.dto.OcpTenantGroupDto
;
import
com.pms.ocp.model.dto.PageGroupDto
;
import
com.pms.ocp.model.dto.PageOcpTenantDto
;
import
com.pms.ocp.model.dto.TenanBaseDto
;
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.ResponseVO
;
import
java.util.List
;
import
java.util.Set
;
public
interface
TenantService
extends
IService
<
OcpTenantGroup
>
{
/**
* 应用树分类管理
* @return
*/
OcpTenantGroupDto
getTree
();
List
<
OcpTenantGroup
>
getTree
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
);
/**
* 应用新增
...
...
@@ -46,17 +40,25 @@ public interface TenantService extends IService<OcpTenantGroup> {
boolean
gettenantDelete
(
OcpTenantGroup
ocpTenantGroup
);
/**
* 应用分类--应用管理
* @param ocpTenantDto
* 应用--查询
* @param tenantGroupCode
* @param tenantGroupCompanyCode
* @return
*/
List
<
OcpTenantGroup
>
getsUse
(
PageOcpTenantDto
ocpTenantDto
);
Page
<
OcpTenantGroup
>
getselects
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
,
int
currentPage
,
int
pageSize
);
/**
* 应用分类--应用服务分页查
* @param pageOcpTenantDto
/*// 应用分类--一级
OcpTenantGroupDto getTenantOneTree();
// 应用分类--二级
List<TwoTenanList> getTenantTwoTree(String code);*/
/* *//**
* // 应用分类--三级
* @param code
* @return
*/
Page
<
OcpTenantGroup
>
getOnePages
(
PageOcpTenantDto
pageOcpTenantDto
);
*/
/*
List<ThreeTenanList> getTenantThreeTree(String code);*/
}
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
View file @
67f62c47
...
...
@@ -41,9 +41,25 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
*/
@Override
public
ApiTreeGroupDto
getByGroup
()
{
public
List
<
OcpApiGroup
>
getByGroup
(
String
apiGroupPromotionType
,
String
apiGroupCode
)
{
// if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) {
// List<OcpApiGroup> ocpApiGroups = mapper.selectApiGroups();
// return ocpApiGroups;
// }else
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
StringUtils
.
isBlank
(
apiGroupCode
)){
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectTwoApiGroups
(
apiGroupPromotionType
);
return
ocpApiGroups
;
}
else
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
!(
StringUtils
.
isBlank
(
apiGroupCode
))){
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectThreeApiGroupsList
(
apiGroupPromotionType
,
apiGroupCode
);
return
ocpApiGroups
;
}
return
null
;
}
//服务树全表数据
/*
//服务树全表数据
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
...
...
@@ -76,15 +92,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
return apiTreeGroupList;
}
/**
*/
/**
* 2中心层
*
* @param oneTreeUpLists
* @return
*/
*/
/*
public List<TwoDownList> twoTreeLists(List<OneTreeUpList> oneTreeUpLists, List<OcpApiGroup> ocpApiGroups) {
/* List<OcpApiGroup> groupList = new ArrayList<>();*/
*//* List<OcpApiGroup> groupList = new ArrayList<>();*//*
List<TwoDownList> twoTreeLists = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
TwoDownList twoDownList = new TwoDownList();
...
...
@@ -102,12 +118,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
}
/**
*/
/**
* 3服务组层
*
* @param twoDownLists
* @return
*/
*/
/*
public List<ThreeTreeList> threeTreeLists(List<TwoDownList> twoDownLists, List<OcpApiGroup> ocpApiGroups) {
List<ThreeTreeList> threeTreeLists = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
...
...
@@ -126,19 +142,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
}
/**
*/
/**
* 4服务层
*
* @param threeTreeLists
* @return
*/
*/
/*
public List<FourTreeList> fourTreeLists(List<ThreeTreeList> threeTreeLists, List<OcpApiGroup> ocpApiGroups) {
List<FourTreeList> foureTreeList = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
FourTreeList
fourTreeList
=
new
FourTreeList
();
if (!(ocpApiGroup.getIsDelete() == 0)) {
if (ocpApiGroup.getApiGroupLevel() == 4) {
BeanUtils
.
copyProperties
(
fourTreeList
,
foureTreeList
);
FourTreeList fourTreeList = new FourTreeList();
BeanUtils.copyProperties(ocpApiGroup, fourTreeList);
foureTreeList.add(fourTreeList);
}
} else {
...
...
@@ -149,7 +165,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
return foureTreeList;
}
*/
/**
* 新增服务分类
*
...
...
@@ -168,7 +184,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
break
;
}
}
if
(
flag
==
true
)
{
OcpApiGroup
ocpApiGroup1
=
new
OcpApiGroup
();
ocpApiGroup1
.
setObjId
(
""
);
...
...
@@ -253,8 +268,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
*/
@Override
public
Page
<
OcpApiGroup
>
getOnePages
(
PageGroupDto
pageGroupDto
)
{
Page
pageInfo
=
new
Page
(
pageGroupDto
.
getPageSize
(),
pageGroupDto
.
getPageNum
());
if
(
pageGroupDto
.
getApiGroupLevel
()
==
1
&&
""
.
equals
(
pageGroupDto
.
getApiGroupPcode
()))
{
if
(
pageGroupDto
.
getApiGroupLevel
()
==
1
&&
""
.
equals
(
pageGroupDto
.
getApiGroupPcode
())){
LambdaQueryWrapper
<
OcpApiGroup
>
queryWrapper
=
new
LambdaQueryWrapper
();
queryWrapper
.
eq
(
OcpApiGroup:
:
getApiGroupLevel
,
pageGroupDto
.
getApiGroupLevel
());
mapper
.
selectPage
(
pageInfo
,
queryWrapper
);
...
...
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
View file @
67f62c47
...
...
@@ -34,68 +34,25 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
*
* @return
*/
@Override
public
OcpTenantGroupDto
getTree
()
{
List
<
OcpTenantGroup
>
ocpTenantGroups
=
tenantMapper
.
selectList
(
null
);
//返回参数集合
OcpTenantGroupDto
ocpTenantGroupDto
=
new
OcpTenantGroupDto
();
//顶级目录
Set
<
String
>
stringSet
=
new
HashSet
<>();
for
(
OcpTenantGroup
ocpTenantGroup
:
ocpTenantGroups
)
{
String
tenantGroupCompanyCode
=
ocpTenantGroup
.
getTenantGroupCompanyCode
();
stringSet
.
add
(
tenantGroupCompanyCode
);
@Override
public
List
<
OcpTenantGroup
>
getTree
(
String
tenantGroupCompanyCode
,
String
tenantGroupCode
)
{
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
null
;
if
(
StringUtils
.
isBlank
(
tenantGroupCode
)
&&
StringUtils
.
isBlank
(
tenantGroupCompanyCode
)){
//顶级目录
ocpTenantGroupList
=
tenantMapper
.
oneTenantGroup
();
}
else
if
(!(
StringUtils
.
isBlank
(
tenantGroupCompanyCode
))
&&
StringUtils
.
isBlank
(
tenantGroupCode
)){
//二级目录
ocpTenantGroupList
=
tenantMapper
.
selectGroups
(
tenantGroupCompanyCode
);
}
List
<
TwoTenanList
>
tenanLists
=
twoTenanTree
(
ocpTenantGroups
,
stringSet
);
List
<
ThreeTenanList
>
threeTenanLists
=
ThreeTenanTree
(
ocpTenantGroups
,
tenanLists
);
ocpTenantGroupDto
.
setOneList
(
stringSet
);
ocpTenantGroupDto
.
setTwoList
(
tenanLists
);
ocpTenantGroupDto
.
setThreeList
(
threeTenanLists
);
else
if
(!(
StringUtils
.
isBlank
(
tenantGroupCompanyCode
))
&&!(
StringUtils
.
isBlank
(
tenantGroupCompanyCode
))){
//三级目录
ocpTenantGroupList
=
tenantMapper
.
selectTenantGroups
(
tenantGroupCode
,
tenantGroupCompanyCode
);
return
ocpTenantGroupDto
;
}
private
List
<
ThreeTenanList
>
ThreeTenanTree
(
List
<
OcpTenantGroup
>
ocpTenantGroups
,
List
<
TwoTenanList
>
tenanLists
)
{
//三级应用详情
List
<
ThreeTenanList
>
threeTenanLists
=
new
ArrayList
<>();
for
(
TwoTenanList
tenanList
:
tenanLists
)
{
for
(
OcpTenantGroup
ocpTenantGroup
:
ocpTenantGroups
)
{
ThreeTenanList
threeTenanList
=
new
ThreeTenanList
();
if
(
tenanList
.
getTenantGroupCode
().
equals
(
ocpTenantGroup
.
getTenantGroupPcode
())
&&
ocpTenantGroup
.
getTenantGroupLevel
()
==
2
){
BeanUtils
.
copyProperties
(
ocpTenantGroup
,
threeTenanList
);
threeTenanLists
.
add
(
threeTenanList
);
}
}
}
return
threeTenanLists
;
return
ocpTenantGroupList
;
}
/**
* 二级 应用管理
* @param ocpTenantGroups
* @param stringSet
* @return
*/
private
List
<
TwoTenanList
>
twoTenanTree
(
List
<
OcpTenantGroup
>
ocpTenantGroups
,
Set
<
String
>
stringSet
)
{
//一级数据集合
List
<
TwoTenanList
>
twoTenanLists
=
new
ArrayList
<>();
for
(
String
code
:
stringSet
)
{
for
(
OcpTenantGroup
ocpTenantGroup
:
ocpTenantGroups
)
{
TwoTenanList
twoTenanList
=
new
TwoTenanList
();
if
(
code
.
equals
(
ocpTenantGroup
.
getTenantGroupCompanyCode
())
&&
ocpTenantGroup
.
getTenantGroupLevel
()
==
1
){
BeanUtils
.
copyProperties
(
ocpTenantGroup
,
twoTenanList
);
twoTenanLists
.
add
(
twoTenanList
);
}
}
}
return
twoTenanLists
;
}
/**
* 应用新增
*
...
...
@@ -188,64 +145,28 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
}
/**
* 应用
分类--应用管理
* 应用
--查询
*
* @param ocpTenantDto
* @param tenantGroupCode
* @param tenantGroupCompanyCode
* @return
*/
@Override
public
List
<
OcpTenantGroup
>
getsUse
(
PageOcpTenantDto
ocpTenantDto
)
{
LambdaQueryWrapper
<
OcpTenantGroup
>
qw
=
new
LambdaQueryWrapper
<>();
qw
.
eq
(
OcpTenantGroup:
:
getTenantGroupCompanyCode
,
ocpTenantDto
.
getTenantGroupCompanyCode
());
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
tenantMapper
.
selectList
(
qw
);
/*for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
if ("".equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantDto.getTenantGroupCompanyCode().equals(ocpTenantGroup.getTenantGroupCompanyCode())
&& ocpTenantGroup.getTenantGroupLevel() == 1){
ocpTenantGroups.add(ocpTenantGroup);
}
}*/
return
ocpTenantGroupList
;
}
public
Page
<
OcpTenantGroup
>
getselects
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
,
int
currentPage
,
int
pageSize
)
{
Page
<
OcpTenantGroup
>
page
=
new
Page
<>(
currentPage
,
pageSize
);
if
(
StringUtils
.
isBlank
(
tenantGroupCode
)){
//顶级目录
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
tenantMapper
.
selectTenantGroup
(
tenantGroupCompanyCode
);
page
.
setRecords
(
ocpTenantGroupList
);
/**
* 应用分类--应用服务分页查
* @param pageOcpTenantDto
* @return
*/
@Override
public
Page
<
OcpTenantGroup
>
getOnePages
(
PageOcpTenantDto
pageOcpTenantDto
)
{
Page
<
OcpTenantGroup
>
pageInfo
;
int
pageSize
=
pageOcpTenantDto
.
getPageSize
();
int
pageNum
=
pageOcpTenantDto
.
getPageNum
();
if
(
pageSize
!=
0
&&
pageNum
!=
0
){
pageInfo
=
new
Page
<>(
pageSize
,
pageNum
);
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
tenantMapper
.
selectList
(
null
);
for
(
OcpTenantGroup
ocpTenantGroup
:
ocpTenantGroupList
)
{
if
(
""
.
equals
(
ocpTenantGroup
.
getTenantGroupPcode
())){
continue
;
}
if
(
pageOcpTenantDto
.
getTenantGroupCode
().
equals
(
ocpTenantGroup
.
getTenantGroupPcode
())){
LambdaQueryWrapper
<
OcpTenantGroup
>
queryWrapper
=
new
LambdaQueryWrapper
();
queryWrapper
.
eq
(
OcpTenantGroup:
:
getTenantGroupLevel
,
2
);
queryWrapper
.
eq
(
OcpTenantGroup:
:
getTenantGroupCompanyCode
,
ocpTenantGroup
.
getTenantGroupCompanyCode
());
tenantMapper
.
selectPage
(
pageInfo
,
queryWrapper
);
}
}
}
else
{
pageSize
=
1
;
pageNum
=
5
;
pageInfo
=
new
Page
<>(
pageSize
,
pageNum
);
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
tenantMapper
.
selectList
(
null
);
for
(
OcpTenantGroup
ocpTenantGroup
:
ocpTenantGroupList
)
{
if
(
ocpTenantGroup
.
getTenantGroupPcode
().
equals
(
pageOcpTenantDto
.
getTenantGroupCode
())){
LambdaQueryWrapper
<
OcpTenantGroup
>
queryWrapper
=
new
LambdaQueryWrapper
();
queryWrapper
.
eq
(
OcpTenantGroup:
:
getTenantGroupLevel
,
2
);
tenantMapper
.
selectPage
(
pageInfo
,
queryWrapper
);
}
}
List
<
OcpTenantGroup
>
ocpTenantGroupList
=
tenantMapper
.
selectTenantGroups
(
tenantGroupCode
,
tenantGroupCompanyCode
);
page
.
setRecords
(
ocpTenantGroupList
);
}
return
pageInfo
;
return
page
;
}
}
src/main/resources/mapper/OcpApiTreeMapper.xml
0 → 100644
View file @
67f62c47
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.pms.ocp.mapper.OcpApiTreeMapper"
>
<!-- 一级树-->
<select
id=
"selectApiGroups"
resultType=
"com.pms.ocp.model.entity.OcpApiGroup"
>
SELECT * FROM (select *,ROW_NUMBER() over(partition by api_group_promotion_type) as rn from ocp_api_group) as u where u.rn= 1;
</select>
<!-- 二级树-->
<select
id=
"selectTwoApiGroups"
resultType=
"com.pms.ocp.model.entity.OcpApiGroup"
>
SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType};
</select>
<!--三级-->
<select
id=
"selectThreeApiGroupsList"
resultType=
"com.pms.ocp.model.entity.OcpApiGroup"
>
SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode};
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/OcpTenantGroup.xml
View file @
67f62c47
...
...
@@ -2,15 +2,29 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.pms.ocp.mapper.TenantMapper"
>
<!-- 顶级目录-->
<select
id=
"oneTenantGroup"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM (select *,ROW_NUMBER() over(partition by tenant_group_company_code) as rn from ocp_tenant_group) as u where u.rn= 1;
</select>
<!-- 二级目录树-->
<select
id=
"twoTenantGroups"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} ;
</select>
SELECT * FROM ocp_tenant_group WHERE tenant_group_code = #{tenant_group_company_pcode};
<!--三级目录-->
<select
id=
"selectTenantGroups"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2';
</select>
<select
id=
"twoTenantGroups"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM ocp_tenant_group WHERE ocp_tenant_group.tenant_group_code = '{tenant_group_company_pcode};
<select
id=
"selectTenantGroup"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode};
</select>
<select
id=
"selectGroups"
resultType=
"com.pms.ocp.model.entity.OcpTenantGroup"
>
SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ;
</select>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment