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
8a336758
Commit
8a336758
authored
Mar 18, 2022
by
胡秀武
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
b8ba5ee7
b7bef58f
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
478 additions
and
1444 deletions
+478
-1444
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
...ain/java/com/pms/ocp/controller/OcpApiTreeController.java
+2
-6
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
...m/pms/ocp/controller/TenantBasicManagementController.java
+2
-1
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
+1
-1
src/main/java/com/pms/ocp/model/dto/PageGroupDto.java
src/main/java/com/pms/ocp/model/dto/PageGroupDto.java
+12
-0
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
+98
-1
src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java
src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java
+0
-182
src/main/java/com/pms/ocp/model/entity/OcpApiBase.java
src/main/java/com/pms/ocp/model/entity/OcpApiBase.java
+116
-112
src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java
src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java
+42
-90
src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java
src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java
+6
-164
src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java
src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java
+69
-95
src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java
src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java
+5
-325
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
+26
-248
src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java
src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java
+5
-0
src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java
src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java
+9
-161
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
+1
-1
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
.../java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+58
-43
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
...ms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+25
-12
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
...main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+1
-2
No files found.
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
View file @
8a336758
...
@@ -43,11 +43,8 @@ public class OcpApiTreeController {
...
@@ -43,11 +43,8 @@ public class OcpApiTreeController {
@PostMapping
(
"/instertree"
)
@PostMapping
(
"/instertree"
)
@ApiOperation
(
"服务树分类--新增"
)
@ApiOperation
(
"服务树分类--新增"
)
public
ResponseVO
inseter
(
@RequestBody
OcpApiGroup
ocpApiGroup
){
public
ResponseVO
inseter
(
@RequestBody
OcpApiGroup
ocpApiGroup
){
boolean
flag
=
service
.
insertTree
(
ocpApiGroup
);
OcpApiGroup
ocpApiGroup1
=
service
.
insertTree
(
ocpApiGroup
);
if
(
flag
){
return
ResponseVO
.
ok
(
ocpApiGroup1
);
return
ResponseVO
.
ok
();
}
return
ResponseVO
.
error
(
"您的服务编码重复,请重新输入"
);
}
}
...
@@ -58,7 +55,6 @@ public class OcpApiTreeController {
...
@@ -58,7 +55,6 @@ public class OcpApiTreeController {
return
ResponseVO
.
ok
(
onePages
);
return
ResponseVO
.
ok
(
onePages
);
}
}
@PostMapping
(
"/updatatree"
)
@PostMapping
(
"/updatatree"
)
@ApiOperation
(
"服务树分类--修改"
)
@ApiOperation
(
"服务树分类--修改"
)
public
ResponseVO
updataTree
(
@RequestBody
OcpApiGroup
ocpApiGroup
){
public
ResponseVO
updataTree
(
@RequestBody
OcpApiGroup
ocpApiGroup
){
...
...
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
View file @
8a336758
...
@@ -84,7 +84,8 @@ public class TenantBasicManagementController {
...
@@ -84,7 +84,8 @@ public class TenantBasicManagementController {
@ApiOperation
(
"应用树层级"
)
@ApiOperation
(
"应用树层级"
)
@GetMapping
(
"/tenantBaseTreeOther"
)
@GetMapping
(
"/tenantBaseTreeOther"
)
public
ResponseVO
<
List
<
GroupDto
>>
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
<
GroupDto
>
ocpApiGroups
=
tenantBasicManagementService
.
tenantBaseTreeOther
(
tenantGroupCode
,
tenantGroupCompanyCode
);
List
<
GroupDto
>
ocpApiGroups
=
tenantBasicManagementService
.
tenantBaseTreeOther
(
tenantGroupCode
,
tenantGroupCompanyCode
);
return
ResponseVO
.
ok
(
ocpApiGroups
);
return
ResponseVO
.
ok
(
ocpApiGroups
);
}
}
...
...
src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
View file @
8a336758
...
@@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
...
@@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
List
<
OcpApiGroup
>
selectThreeApiGroupsList
(
Long
apiGroupPromotionType
,
String
apiGroupCode
);
List
<
OcpApiGroup
>
selectThreeApiGroupsList
(
Long
apiGroupPromotionType
,
String
apiGroupCode
);
List
<
OcpApiGroup
>
selectLists
(
Long
apiGroupPromotionType
,
String
apiGroupCode
,
String
apiGroupLevel
);
List
<
OcpApiGroup
>
selectLists
(
Long
apiGroupPromotionType
,
String
apiGroupCode
);
//code重复问题
//code重复问题
List
<
OcpApiGroup
>
selectGroupCode
();
List
<
OcpApiGroup
>
selectGroupCode
();
...
...
src/main/java/com/pms/ocp/model/dto/PageGroupDto.java
View file @
8a336758
...
@@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam {
...
@@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam {
@ApiModelProperty
(
"分层树层级 1中台层 2中心层 3 服务组层 4服务层 "
)
@ApiModelProperty
(
"分层树层级 1中台层 2中心层 3 服务组层 4服务层 "
)
private
String
apiGroupLevel
;
private
String
apiGroupLevel
;
@ApiModelProperty
(
"模糊查询字段"
)
private
String
keyword
;
public
String
getKeyword
()
{
return
keyword
;
}
public
void
setKeyword
(
String
keyword
)
{
this
.
keyword
=
keyword
;
}
public
String
getObjId
()
{
public
String
getObjId
()
{
return
objId
;
return
objId
;
}
}
...
...
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
View file @
8a336758
...
@@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup {
...
@@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup {
return
classIfy
;
return
classIfy
;
}
}
public
void
setClassIfy
(
String
classIfy
)
{
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
Timestamp
getTenantGroupCtime
()
{
return
tenantGroupCtime
;
}
public
void
setTenantGroupCtime
(
Timestamp
tenantGroupCtime
)
{
this
.
tenantGroupCtime
=
tenantGroupCtime
;
}
public
Timestamp
getTenantGroupMtime
()
{
return
tenantGroupMtime
;
}
public
void
setTenantGroupMtime
(
Timestamp
tenantGroupMtime
)
{
this
.
tenantGroupMtime
=
tenantGroupMtime
;
}
public
Short
getIsDelete
()
{
return
isDelete
;
}
public
void
setIsDelete
(
Short
isDelete
)
{
this
.
isDelete
=
isDelete
;
}
public
String
getTenantGroupLevel
()
{
return
tenantGroupLevel
;
}
public
void
setTenantGroupLevel
(
String
tenantGroupLevel
)
{
this
.
tenantGroupLevel
=
tenantGroupLevel
;
}
public
OcpTenantGroup
setClassIfy
(
String
classIfy
)
{
this
.
classIfy
=
classIfy
;
this
.
classIfy
=
classIfy
;
return
null
;
}
}
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java
View file @
8a336758
...
@@ -59,60 +59,6 @@ public class OcpApiAudit {
...
@@ -59,60 +59,6 @@ public class OcpApiAudit {
@ApiModelProperty
(
"当前版本"
)
@ApiModelProperty
(
"当前版本"
)
private
long
applyVersion
;
private
long
applyVersion
;
@ApiModelProperty
(
"上一版本"
)
@Excel
(
name
=
"上一版本"
,
orderNum
=
"7"
)
private
long
preApiVersion
;
@ApiModelProperty
(
"服务接口中文名称"
)
@Excel
(
name
=
"服务名称"
,
orderNum
=
"2"
)
private
String
apiName
;
@ApiModelProperty
(
"服务分类代码"
)
private
String
apiGroupCode
;
@ApiModelProperty
(
"推广类型0:统建;1:自建"
)
private
long
apiPromotion
;
@ApiModelProperty
(
"服务请求体"
)
@Excel
(
name
=
"请求参数"
,
orderNum
=
"8"
)
private
String
apiReq
;
@ApiModelProperty
(
"服务返回体"
)
@Excel
(
name
=
"返回参数"
,
orderNum
=
"9"
)
private
String
apiResp
;
@ApiModelProperty
(
"服务地址"
)
private
String
apiUrl
;
@ApiModelProperty
(
"服务创建时间"
)
private
Timestamp
apiCtime
;
@ApiModelProperty
(
"服务修改时间"
)
private
Timestamp
apiMtime
;
@ApiModelProperty
(
"创建者用户ID"
)
private
String
apiUserId
;
@ApiModelProperty
(
"建设单位"
)
private
String
apiUnit
;
@ApiModelProperty
(
"服务所属公司"
)
private
String
ownerCompanyCode
;
@ApiModelProperty
(
"服务所属公司"
)
private
String
ownerCompanyName
;
@ApiModelProperty
(
"所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区"
)
private
long
apiZone
;
@ApiModelProperty
(
"'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;"
)
private
long
apiLayer
;
@ApiModelProperty
(
"服务版本(最新版本)"
)
@Excel
(
name
=
"当前版本"
,
orderNum
=
"6"
)
private
long
apiVersion
;
public
String
getObjId
()
{
public
String
getObjId
()
{
return
objId
;
return
objId
;
}
}
...
@@ -216,132 +162,4 @@ public class OcpApiAudit {
...
@@ -216,132 +162,4 @@ public class OcpApiAudit {
public
void
setApplyVersion
(
long
applyVersion
)
{
public
void
setApplyVersion
(
long
applyVersion
)
{
this
.
applyVersion
=
applyVersion
;
this
.
applyVersion
=
applyVersion
;
}
}
public
long
getPreApiVersion
()
{
return
preApiVersion
;
}
public
void
setPreApiVersion
(
long
preApiVersion
)
{
this
.
preApiVersion
=
preApiVersion
;
}
public
String
getApiName
()
{
return
apiName
;
}
public
void
setApiName
(
String
apiName
)
{
this
.
apiName
=
apiName
;
}
public
String
getApiGroupCode
()
{
return
apiGroupCode
;
}
public
void
setApiGroupCode
(
String
apiGroupCode
)
{
this
.
apiGroupCode
=
apiGroupCode
;
}
public
long
getApiPromotion
()
{
return
apiPromotion
;
}
public
void
setApiPromotion
(
long
apiPromotion
)
{
this
.
apiPromotion
=
apiPromotion
;
}
public
String
getApiReq
()
{
return
apiReq
;
}
public
void
setApiReq
(
String
apiReq
)
{
this
.
apiReq
=
apiReq
;
}
public
String
getApiResp
()
{
return
apiResp
;
}
public
void
setApiResp
(
String
apiResp
)
{
this
.
apiResp
=
apiResp
;
}
public
String
getApiUrl
()
{
return
apiUrl
;
}
public
void
setApiUrl
(
String
apiUrl
)
{
this
.
apiUrl
=
apiUrl
;
}
public
Timestamp
getApiCtime
()
{
return
apiCtime
;
}
public
void
setApiCtime
(
Timestamp
apiCtime
)
{
this
.
apiCtime
=
apiCtime
;
}
public
Timestamp
getApiMtime
()
{
return
apiMtime
;
}
public
void
setApiMtime
(
Timestamp
apiMtime
)
{
this
.
apiMtime
=
apiMtime
;
}
public
String
getApiUserId
()
{
return
apiUserId
;
}
public
void
setApiUserId
(
String
apiUserId
)
{
this
.
apiUserId
=
apiUserId
;
}
public
String
getApiUnit
()
{
return
apiUnit
;
}
public
void
setApiUnit
(
String
apiUnit
)
{
this
.
apiUnit
=
apiUnit
;
}
public
String
getOwnerCompanyCode
()
{
return
ownerCompanyCode
;
}
public
void
setOwnerCompanyCode
(
String
ownerCompanyCode
)
{
this
.
ownerCompanyCode
=
ownerCompanyCode
;
}
public
String
getOwnerCompanyName
()
{
return
ownerCompanyName
;
}
public
void
setOwnerCompanyName
(
String
ownerCompanyName
)
{
this
.
ownerCompanyName
=
ownerCompanyName
;
}
public
long
getApiZone
()
{
return
apiZone
;
}
public
void
setApiZone
(
long
apiZone
)
{
this
.
apiZone
=
apiZone
;
}
public
long
getApiLayer
()
{
return
apiLayer
;
}
public
void
setApiLayer
(
long
apiLayer
)
{
this
.
apiLayer
=
apiLayer
;
}
public
long
getApiVersion
()
{
return
apiVersion
;
}
public
void
setApiVersion
(
long
apiVersion
)
{
this
.
apiVersion
=
apiVersion
;
}
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiBase.java
View file @
8a336758
...
@@ -73,109 +73,78 @@ public class OcpApiBase {
...
@@ -73,109 +73,78 @@ public class OcpApiBase {
@ApiModelProperty
(
"服务版本(最新版本)"
)
@ApiModelProperty
(
"服务版本(最新版本)"
)
private
String
apiVersion
;
private
String
apiVersion
;
public
long
getApiZone
()
{
@ApiModelProperty
(
"服务所属中心编码所属中心"
)
return
apiZone
;
private
String
apiCenterCode
;
}
public
void
setApiZone
(
long
apiZone
)
{
@ApiModelProperty
(
"服务简述"
)
this
.
apiZone
=
apiZone
;
private
String
apiDescription
;
}
public
long
getApiLayer
()
{
@ApiModelProperty
(
"创建者姓名"
)
return
apiLayer
;
private
String
apiUserName
;
}
public
void
setApiLayer
(
long
apiLayer
)
{
public
String
getObjId
(
)
{
this
.
apiLayer
=
apiLayer
;
return
objId
;
}
}
// public long getApiVersion() {
public
void
setObjId
(
String
objId
)
{
// return apiVersion;
this
.
objId
=
objId
;
// }
//
// public void setApiVersion(long apiVersion) {
// this.apiVersion = apiVersion;
// }
public
String
getApiVersion
()
{
return
apiVersion
;
}
}
public
void
setApiVersion
(
String
apiVersion
)
{
public
String
getApiCode
(
)
{
this
.
apiVersion
=
apiVersion
;
return
apiCode
;
}
}
public
String
getObjId
()
{
public
void
setApiCode
(
String
apiCode
)
{
return
objId
;
this
.
apiCode
=
apiCode
;
}
}
public
void
setObjId
(
String
objId
)
{
this
.
objId
=
objId
;
}
public
String
getApiCode
()
{
return
apiCode
;
}
public
void
setApiCode
(
String
apiCode
)
{
this
.
apiCode
=
apiCode
;
}
public
String
getApiName
()
{
return
apiName
;
}
public
void
setApiName
(
String
apiName
)
{
this
.
apiName
=
apiName
;
}
public
String
getApiGroupCode
()
{
return
apiGroupCode
;
}
public
void
setApiGroupCode
(
String
apiGroupCode
)
{
this
.
apiGroupCode
=
apiGroupCode
;
}
public
long
getApiPromotion
()
{
public
String
getApiName
()
{
return
apiPromotion
;
return
apiName
;
}
}
public
void
setApiPromotion
(
long
apiPromotion
)
{
public
void
setApiName
(
String
apiName
)
{
this
.
apiPromotion
=
apiPromotion
;
this
.
apiName
=
apiName
;
}
}
public
String
getApiGroupCode
()
{
return
apiGroupCode
;
}
public
String
getApiReq
(
)
{
public
void
setApiGroupCode
(
String
apiGroupCode
)
{
return
apiReq
;
this
.
apiGroupCode
=
apiGroupCode
;
}
}
public
void
setApiReq
(
String
apiReq
)
{
public
long
getApiPromotion
(
)
{
this
.
apiReq
=
apiReq
;
return
apiPromotion
;
}
}
public
void
setApiPromotion
(
long
apiPromotion
)
{
this
.
apiPromotion
=
apiPromotion
;
}
public
String
getApiResp
()
{
public
String
getApiReq
()
{
return
apiResp
;
return
apiReq
;
}
}
public
void
setApiResp
(
String
apiResp
)
{
public
void
setApiReq
(
String
apiReq
)
{
this
.
apiResp
=
apiResp
;
this
.
apiReq
=
apiReq
;
}
}
public
String
getApiResp
()
{
return
apiResp
;
}
public
String
getApiUrl
(
)
{
public
void
setApiResp
(
String
apiResp
)
{
return
apiUrl
;
this
.
apiResp
=
apiResp
;
}
}
public
void
setApiUrl
(
String
apiUrl
)
{
public
String
getApiUrl
(
)
{
this
.
apiUrl
=
apiUrl
;
return
apiUrl
;
}
}
public
void
setApiUrl
(
String
apiUrl
)
{
this
.
apiUrl
=
apiUrl
;
}
public
Timestamp
getApiCtime
()
{
public
Timestamp
getApiCtime
()
{
return
apiCtime
;
return
apiCtime
;
...
@@ -194,47 +163,82 @@ public class OcpApiBase {
...
@@ -194,47 +163,82 @@ public class OcpApiBase {
}
}
public
String
getApiUserId
()
{
public
String
getApiUserId
()
{
return
apiUserId
;
return
apiUserId
;
}
}
public
void
setApiUserId
(
String
apiUserId
)
{
this
.
apiUserId
=
apiUserId
;
}
public
String
getApiUnit
()
{
return
apiUnit
;
}
public
void
setApiUnit
(
String
apiUnit
)
{
this
.
apiUnit
=
apiUnit
;
}
public
String
getOwnerCompanyCode
()
{
return
ownerCompanyCode
;
}
public
void
setOwnerCompanyCode
(
String
ownerCompanyCode
)
{
this
.
ownerCompanyCode
=
ownerCompanyCode
;
}
public
long
getIsDelete
()
{
return
isDelete
;
}
public
void
setApiUserId
(
String
apiUserId
)
{
public
void
setIsDelete
(
long
isDelete
)
{
this
.
apiUserId
=
apiUserId
;
this
.
isDelete
=
isDelete
;
}
}
public
long
getApiZone
()
{
return
apiZone
;
}
public
String
getApiUnit
(
)
{
public
void
setApiZone
(
long
apiZone
)
{
return
apiUnit
;
this
.
apiZone
=
apiZone
;
}
}
public
void
setApiUnit
(
String
apiUnit
)
{
public
long
getApiLayer
(
)
{
this
.
apiUnit
=
apiUnit
;
return
apiLayer
;
}
}
public
void
setApiLayer
(
long
apiLayer
)
{
this
.
apiLayer
=
apiLayer
;
}
public
String
getOwnerCompanyCode
()
{
public
String
getApiVersion
()
{
return
ownerCompanyCode
;
return
apiVersion
;
}
}
public
void
setOwnerCompanyCode
(
String
ownerCompanyCode
)
{
public
void
setApiVersion
(
String
apiVersion
)
{
this
.
ownerCompanyCode
=
ownerCompanyCode
;
this
.
apiVersion
=
apiVersion
;
}
}
public
String
getApiCenterCode
()
{
return
apiCenterCode
;
}
// public String getOwnerCompanyName() {
public
void
setApiCenterCode
(
String
apiCenterCode
)
{
// return ownerCompanyName;
this
.
apiCenterCode
=
apiCenterCode
;
// }
}
//
// public void setOwnerCompanyName(String ownerCompanyName) {
// this.ownerCompanyName = ownerCompanyName;
// }
public
String
getApiDescription
()
{
return
apiDescription
;
}
public
long
getIsDelete
(
)
{
public
void
setApiDescription
(
String
apiDescription
)
{
return
isDelete
;
this
.
apiDescription
=
apiDescription
;
}
}
public
void
setIsDelete
(
long
isDelete
)
{
public
String
getApiUserName
(
)
{
this
.
isDelete
=
isDelet
e
;
return
apiUserNam
e
;
}
}
public
void
setApiUserName
(
String
apiUserName
)
{
this
.
apiUserName
=
apiUserName
;
}
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java
View file @
8a336758
...
@@ -37,107 +37,59 @@ public class OcpApiModelRel {
...
@@ -37,107 +37,59 @@ public class OcpApiModelRel {
@ApiModelProperty
(
"是否已删除 0-否1-是"
)
@ApiModelProperty
(
"是否已删除 0-否1-是"
)
private
long
isDelete
;
private
long
isDelete
;
@ApiModelProperty
(
"服务接口中文名称"
)
public
String
getObjId
()
{
private
String
apiName
;
return
objId
;
}
@ApiModelProperty
(
"服务分类代码"
)
public
void
setObjId
(
String
objId
)
{
private
String
apiGroupCode
;
this
.
objId
=
objId
;
}
@ApiModelProperty
(
"推广类型0:统建;1:自建"
)
public
String
getModelCode
()
{
private
long
apiPromotion
;
return
modelCode
;
}
@ApiModelProperty
(
"服务请求体"
)
public
void
setModelCode
(
String
modelCode
)
{
private
String
apiReq
;
this
.
modelCode
=
modelCode
;
}
@ApiModelProperty
(
"服务返回体"
)
public
String
getModelDepCompanyCode
()
{
private
String
apiResp
;
return
modelDepCompanyCode
;
}
@ApiModelProperty
(
"服务地址"
)
public
void
setModelDepCompanyCode
(
String
modelDepCompanyCode
)
{
private
String
apiUrl
;
this
.
modelDepCompanyCode
=
modelDepCompanyCode
;
}
@ApiModelProperty
(
"服务创建时间"
)
public
String
getApiCode
()
{
private
Timestamp
apiCtime
;
return
apiCode
;
}
@ApiModelProperty
(
"服务修改时间"
)
public
void
setApiCode
(
String
apiCode
)
{
private
Timestamp
apiMtime
;
this
.
apiCode
=
apiCode
;
}
@ApiModelProperty
(
"创建者用户ID"
)
public
String
getApiDepCompanyCode
()
{
private
String
apiUserId
;
return
apiDepCompanyCode
;
}
@ApiModelProperty
(
"建设单位"
)
public
void
setApiDepCompanyCode
(
String
apiDepCompanyCode
)
{
private
String
apiUnit
;
this
.
apiDepCompanyCode
=
apiDepCompanyCode
;
}
@ApiModelProperty
(
"服务所属公司"
)
public
Timestamp
getRelationCtime
()
{
private
String
ownerCompanyCode
;
return
relationCtime
;
}
@ApiModelProperty
(
"服务所属公司"
)
public
void
setRelationCtime
(
Timestamp
relationCtime
)
{
private
String
ownerCompanyName
;
this
.
relationCtime
=
relationCtime
;
}
@ApiModelProperty
(
"所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区"
)
private
long
apiZone
;
@ApiModelProperty
(
"'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;"
)
private
long
apiLayer
;
@ApiModelProperty
(
"服务版本(最新版本)"
)
private
long
apiVersion
;
@ApiModelProperty
(
"应用编码"
)
private
String
tenantCode
;
@ApiModelProperty
(
"应用名称"
)
private
String
tenantName
;
@ApiModelProperty
(
"应用分类代码"
)
private
String
tenantGroupCode
;
@ApiModelProperty
(
"应用IP"
)
private
String
tenantIp
;
@ApiModelProperty
(
"应用url"
)
private
String
tenantUrl
;
@ApiModelProperty
(
"所属专业"
)
private
String
professionalKind
;
@ApiModelProperty
(
"创建者用户ID"
)
private
String
tenantUserId
;
@ApiModelProperty
(
"排序"
)
private
String
tenantOrderNo
;
@ApiModelProperty
(
"创建时间"
)
private
String
tenantCtime
;
@ApiModelProperty
(
"最后更新时间"
)
private
String
tenantMtime
;
@ApiModelProperty
(
"部署名称"
)
private
String
deploymentName
;
@ApiModelProperty
(
"描述"
)
private
String
tenantDescription
;
@ApiModelProperty
(
"应用状态0设计 1运行态"
)
private
String
tenantState
;
@ApiModelProperty
(
"模型名称"
)
private
String
modelName
;
@ApiModelProperty
(
"建设单位"
)
private
String
tenantUnit
;
@ApiModelProperty
(
"所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区"
)
private
String
tenantZone
;
@ApiModelProperty
(
"所属层级 1:应用层;2:平台层;3:网络层;4:感知层"
)
private
String
tenantLayer
;
@ApiModelProperty
(
"应用版本(当前版本)"
)
private
String
tenantVersion
;
@ApiModelProperty
(
"应用版本(当前版本)"
)
private
String
tenanttVersion
;
public
long
getIsDelete
()
{
return
isDelete
;
}
public
void
setIsDelete
(
long
isDelete
)
{
this
.
isDelete
=
isDelete
;
}
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java
View file @
8a336758
...
@@ -40,52 +40,6 @@ public class OcpApiSubs {
...
@@ -40,52 +40,6 @@ public class OcpApiSubs {
@ApiModelProperty
(
"是否删除0-否,1-是"
)
@ApiModelProperty
(
"是否删除0-否,1-是"
)
private
long
isDelete
;
private
long
isDelete
;
// @ApiModelProperty("服务接口中文名称")
// private String apiName;
//
// @ApiModelProperty("服务分类代码")
// private String apiGroupCode;
// @ApiModelProperty("推广类型0:统建;1:自建")
// private long apiPromotion;
// @ApiModelProperty("服务请求体")
// private String apiReq;
//
// @ApiModelProperty("服务返回体")
// private String apiResp;
//
// @ApiModelProperty("服务地址")
// private String apiUrl;
//
// @ApiModelProperty("服务创建时间")
// private Timestamp apiCtime;
//
// @ApiModelProperty("服务修改时间")
// private Timestamp apiMtime;
//
// @ApiModelProperty("创建者用户ID")
// private String apiUserId;
//
// @ApiModelProperty("建设单位")
// private String apiUnit;
//
// @ApiModelProperty("服务所属公司")
// private String ownerCompanyCode;
//
// @ApiModelProperty("服务所属公司")
// private String ownerCompanyName;
//
// @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
// private long apiZone;
//
// @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
// private long apiLayer;
//
// @ApiModelProperty("服务版本(最新版本)")
// private long apiVersion;
public
String
getObjId
()
{
public
String
getObjId
()
{
return
objId
;
return
objId
;
}
}
...
@@ -142,123 +96,11 @@ public class OcpApiSubs {
...
@@ -142,123 +96,11 @@ public class OcpApiSubs {
this
.
subsCompanyCode
=
subsCompanyCode
;
this
.
subsCompanyCode
=
subsCompanyCode
;
}
}
// public String getApiName() {
public
long
getIsDelete
()
{
// return apiName;
return
isDelete
;
// }
}
//
// public void setApiName(String apiName) {
// this.apiName = apiName;
// }
//
// public String getApiGroupCode() {
// return apiGroupCode;
// }
//
// public void setApiGroupCode(String apiGroupCode) {
// this.apiGroupCode = apiGroupCode;
// }
// public long getApiPromotion() {
// return apiPromotion;
// }
//
// public void setApiPromotion(long apiPromotion) {
// this.apiPromotion = apiPromotion;
// }
// public String getApiReq() {
// return apiReq;
// }
//
// public void setApiReq(String apiReq) {
// this.apiReq = apiReq;
// }
//
// public String getApiResp() {
// return apiResp;
// }
//
// public void setApiResp(String apiResp) {
// this.apiResp = apiResp;
// }
//
// public String getApiUrl() {
// return apiUrl;
// }
//
// public void setApiUrl(String apiUrl) {
// this.apiUrl = apiUrl;
// }
//
// public Timestamp getApiCtime() {
// return apiCtime;
// }
//
// public void setApiCtime(Timestamp apiCtime) {
// this.apiCtime = apiCtime;
// }
//
// public Timestamp getApiMtime() {
// return apiMtime;
// }
//
// public void setApiMtime(Timestamp apiMtime) {
// this.apiMtime = apiMtime;
// }
//
// public String getApiUserId() {
// return apiUserId;
// }
//
// public void setApiUserId(String apiUserId) {
// this.apiUserId = apiUserId;
// }
//
// public String getApiUnit() {
// return apiUnit;
// }
// public void setApiUnit(String apiUnit) {
public
void
setIsDelete
(
long
isDelete
)
{
// this.apiUnit = apiUnit;
this
.
isDelete
=
isDelete
;
// }
}
//
// public String getOwnerCompanyCode() {
// return ownerCompanyCode;
// }
//
// public void setOwnerCompanyCode(String ownerCompanyCode) {
// this.ownerCompanyCode = ownerCompanyCode;
// }
//
// public String getOwnerCompanyName() {
// return ownerCompanyName;
// }
//
// public void setOwnerCompanyName(String ownerCompanyName) {
// this.ownerCompanyName = ownerCompanyName;
// }
//
// public long getApiZone() {
// return apiZone;
// }
//
// public void setApiZone(long apiZone) {
// this.apiZone = apiZone;
// }
//
// public long getApiLayer() {
// return apiLayer;
// }
//
// public void setApiLayer(long apiLayer) {
// this.apiLayer = apiLayer;
// }
//
// public long getApiVersion() {
// return apiVersion;
// }
//
// public void setApiVersion(long apiVersion) {
// this.apiVersion = apiVersion;
// }
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java
View file @
8a336758
...
@@ -43,101 +43,75 @@ public class OcpApiTenantRel {
...
@@ -43,101 +43,75 @@ public class OcpApiTenantRel {
@ApiModelProperty
(
"关系创建用户"
)
@ApiModelProperty
(
"关系创建用户"
)
private
String
apiTenantRelUserName
;
private
String
apiTenantRelUserName
;
@ApiModelProperty
(
"是否已删除0未删除,1已删除"
)
public
String
getObjId
()
{
private
long
isDelete
;
return
objId
;
}
// @ApiModelProperty("服务接口中文名称")
// private String apiName;
//
// @ApiModelProperty("服务分类代码")
// private String apiGroupCode;
//
// @ApiModelProperty("推广类型0:统建;1:自建")
// private long apiPromotion;
//
// @ApiModelProperty("服务请求体")
// private String apiReq;
//
// @ApiModelProperty("服务返回体")
// private String apiResp;
//
// @ApiModelProperty("服务地址")
// private String apiUrl;
//
// @ApiModelProperty("服务创建时间")
// private Timestamp apiCtime;
//
// @ApiModelProperty("服务修改时间")
// private Timestamp apiMtime;
//
// @ApiModelProperty("创建者用户ID")
// private String apiUserId;
//
// @ApiModelProperty("建设单位")
// private String apiUnit;
//
// @ApiModelProperty("服务所属公司")
// private String ownerCompanyCode;
//
// @ApiModelProperty("服务所属公司")
// private String ownerCompanyName;
//
// @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
// private long apiZone;
//
// @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
// private long apiLayer;
//
// @ApiModelProperty("服务版本(最新版本)")
// private long apiVersion;
//
// @ApiModelProperty("应用名称")
// private String tenantName;
//
// @ApiModelProperty("应用分类代码")
// private String tenantGroupCode;
//
// @ApiModelProperty("应用IP")
// private String tenantIp;
//
// @ApiModelProperty("应用url")
// private String tenantUrl;
//
// @ApiModelProperty("所属专业")
// private String professionalKind;
//
// @ApiModelProperty("创建者用户ID")
// private String tenantUserId;
//
// @ApiModelProperty("排序")
// private String tenantOrderNo;
//
// @ApiModelProperty("创建时间")
// private String tenantCtime;
//
// @ApiModelProperty("最后更新时间")
// private String tenantMtime;
//
// @ApiModelProperty("部署名称")
// private String deploymentName;
//
// @ApiModelProperty("描述")
// private String tenantDescription;
//
// @ApiModelProperty("应用状态0设计 1运行态")
// private String tenantState;
//
// @ApiModelProperty("建设单位")
// private String tenantUnit;
//
// @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
// private String tenantZone;
//
// @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层")
// private String tenantLayer;
//
// @ApiModelProperty("应用版本(当前版本)")
// private String tenantVersion;
public
void
setObjId
(
String
objId
)
{
this
.
objId
=
objId
;
}
public
String
getTenantCode
()
{
return
tenantCode
;
}
public
void
setTenantCode
(
String
tenantCode
)
{
this
.
tenantCode
=
tenantCode
;
}
public
String
getApiCode
()
{
return
apiCode
;
}
public
void
setApiCode
(
String
apiCode
)
{
this
.
apiCode
=
apiCode
;
}
public
String
getApiDepCompanyCode
()
{
return
apiDepCompanyCode
;
}
public
void
setApiDepCompanyCode
(
String
apiDepCompanyCode
)
{
this
.
apiDepCompanyCode
=
apiDepCompanyCode
;
}
public
String
getTenantDepCompanyCode
()
{
return
tenantDepCompanyCode
;
}
public
void
setTenantDepCompanyCode
(
String
tenantDepCompanyCode
)
{
this
.
tenantDepCompanyCode
=
tenantDepCompanyCode
;
}
public
Timestamp
getApiTenantRelCtime
()
{
return
apiTenantRelCtime
;
}
public
void
setApiTenantRelCtime
(
Timestamp
apiTenantRelCtime
)
{
this
.
apiTenantRelCtime
=
apiTenantRelCtime
;
}
public
Timestamp
getApiTenantRelMtime
()
{
return
apiTenantRelMtime
;
}
public
void
setApiTenantRelMtime
(
Timestamp
apiTenantRelMtime
)
{
this
.
apiTenantRelMtime
=
apiTenantRelMtime
;
}
public
String
getApiTenantRelUserId
()
{
return
apiTenantRelUserId
;
}
public
void
setApiTenantRelUserId
(
String
apiTenantRelUserId
)
{
this
.
apiTenantRelUserId
=
apiTenantRelUserId
;
}
public
String
getApiTenantRelUserName
()
{
return
apiTenantRelUserName
;
}
public
void
setApiTenantRelUserName
(
String
apiTenantRelUserName
)
{
this
.
apiTenantRelUserName
=
apiTenantRelUserName
;
}
}
}
src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java
View file @
8a336758
This diff is collapsed.
Click to expand it.
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
View file @
8a336758
This diff is collapsed.
Click to expand it.
src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java
View file @
8a336758
package
com.pms.ocp.model.entity
;
package
com.pms.ocp.model.entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
...
@@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable {
...
@@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable {
@ApiModelProperty
(
"应用树层级 1:应用分组层 2:应用层"
)
@ApiModelProperty
(
"应用树层级 1:应用分组层 2:应用层"
)
private
String
tenantGroupLevel
;
private
String
tenantGroupLevel
;
//上级分类名称
@ApiModelProperty
(
"上级分类名称"
)
@TableField
(
exist
=
false
)
private
String
classIfy
;
public
static
long
getSerialVersionUID
()
{
public
static
long
getSerialVersionUID
()
{
return
serialVersionUID
;
return
serialVersionUID
;
...
...
src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java
View file @
8a336758
...
@@ -71,220 +71,69 @@ public class OcpTenantSubs implements Serializable {
...
@@ -71,220 +71,69 @@ public class OcpTenantSubs implements Serializable {
private
Short
isDelete
;
private
Short
isDelete
;
/**
* 应用名称
*/
@ApiModelProperty
(
"应用名称"
)
private
String
tenantName
;
/**
* 应用分类代码
*/
@ApiModelProperty
(
"应用分类代码"
)
private
String
tenantGroupCode
;
/**
* 应用ip
*/
@ApiModelProperty
(
"应用ip"
)
private
String
tenantIp
;
/**
* 应用url
*/
@ApiModelProperty
(
"应用url"
)
private
String
tenantUrl
;
/**
* 所属专业
*/
@ApiModelProperty
(
"所属专业"
)
private
String
professionalKind
;
/**
* 创建者用户ID
*/
@ApiModelProperty
(
"创建者用户ID"
)
private
String
tenantUserId
;
/**
* 排序
*/
@ApiModelProperty
(
"排序"
)
private
Integer
tenantOrderNo
;
/**
* 创建时间
*/
@ApiModelProperty
(
"创建时间"
)
private
Timestamp
tenantCtime
;
/**
* 最后更新时间
*/
@ApiModelProperty
(
"最后更新时间"
)
private
Timestamp
tenantMtime
;
/**
* 部署名称
*/
@ApiModelProperty
(
"部署名称"
)
private
String
deploymentName
;
/**
* 描述
*/
@ApiModelProperty
(
"描述"
)
private
String
tenantDescription
;
/**
* 应用状态0:设计态;1:运行态
*/
@ApiModelProperty
(
"应用状态0:设计态;1:运行态"
)
private
Short
tenantState
;
// /**
// * 推广类型0:统建;1:自建
// */
// @ApiModelProperty("推广类型0:统建;1:自建")
// private long tenantPromotion;
/**
* 建设单位
*/
@ApiModelProperty
(
"建设单位"
)
private
String
tenantUnit
;
/**
* 所属公司编码
*/
@ApiModelProperty
(
"所属公司编码"
)
private
String
ownerCompanyCode
;
/**
* 所属公司名称
*/
@ApiModelProperty
(
"所属公司名称"
)
private
String
ownerCompanyName
;
/**
* 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
*/
@ApiModelProperty
(
"所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区"
)
private
Short
tenantZone
;
/**
* 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
*/
@ApiModelProperty
(
"所属层级 1:应用层;2:平台层;3:网络层;4:感知层;"
)
private
Short
tenantLayer
;
/**
* 应用版本(当前版本)
*/
@ApiModelProperty
(
"应用版本(当前版本)"
)
private
String
tenantVersion
;
private
static
final
long
serialVersionUID
=
1L
;
/**
* 关系ID
*/
public
String
getObjId
()
{
public
String
getObjId
()
{
return
objId
;
return
objId
;
}
}
/**
* 关系ID
*/
public
void
setObjId
(
String
objId
)
{
public
void
setObjId
(
String
objId
)
{
this
.
objId
=
objId
;
this
.
objId
=
objId
;
}
}
/**
* 服务编码
*/
public
String
getTenantCode
()
{
public
String
getTenantCode
()
{
return
tenantCode
;
return
tenantCode
;
}
}
/**
* 服务编码
*/
public
void
setTenantCode
(
String
tenantCode
)
{
public
void
setTenantCode
(
String
tenantCode
)
{
this
.
tenantCode
=
tenantCode
;
this
.
tenantCode
=
tenantCode
;
}
}
/**
* 订阅公司编码
*/
public
String
getSubsCompanyCode
()
{
public
String
getSubsCompanyCode
()
{
return
subsCompanyCode
;
return
subsCompanyCode
;
}
}
/**
* 订阅公司编码
*/
public
void
setSubsCompanyCode
(
String
subsCompanyCode
)
{
public
void
setSubsCompanyCode
(
String
subsCompanyCode
)
{
this
.
subsCompanyCode
=
subsCompanyCode
;
this
.
subsCompanyCode
=
subsCompanyCode
;
}
}
/**
public
Timestamp
getSubsLogTenantCtime
()
{
* 服务订阅创建时间
*/
public
Date
getSubsLogTenantCtime
()
{
return
subsLogTenantCtime
;
return
subsLogTenantCtime
;
}
}
/**
* 服务订阅创建时间
*/
public
void
setSubsLogTenantCtime
(
Timestamp
subsLogTenantCtime
)
{
public
void
setSubsLogTenantCtime
(
Timestamp
subsLogTenantCtime
)
{
this
.
subsLogTenantCtime
=
subsLogTenantCtime
;
this
.
subsLogTenantCtime
=
subsLogTenantCtime
;
}
}
/**
public
Timestamp
getSubsLogTenantMtime
()
{
* 服务订阅修改时间
*/
public
Date
getSubsLogTenantMtime
()
{
return
subsLogTenantMtime
;
return
subsLogTenantMtime
;
}
}
/**
* 服务订阅修改时间
*/
public
void
setSubsLogTenantMtime
(
Timestamp
subsLogTenantMtime
)
{
public
void
setSubsLogTenantMtime
(
Timestamp
subsLogTenantMtime
)
{
this
.
subsLogTenantMtime
=
subsLogTenantMtime
;
this
.
subsLogTenantMtime
=
subsLogTenantMtime
;
}
}
/**
* 服务订阅创建用户ID
*/
public
String
getSubsLogTenantUserId
()
{
public
String
getSubsLogTenantUserId
()
{
return
subsLogTenantUserId
;
return
subsLogTenantUserId
;
}
}
/**
* 服务订阅创建用户ID
*/
public
void
setSubsLogTenantUserId
(
String
subsLogTenantUserId
)
{
public
void
setSubsLogTenantUserId
(
String
subsLogTenantUserId
)
{
this
.
subsLogTenantUserId
=
subsLogTenantUserId
;
this
.
subsLogTenantUserId
=
subsLogTenantUserId
;
}
}
/**
public
Timestamp
getSubsLogTenantAtime
()
{
* 服务订阅添加时间
*/
public
Date
getSubsLogTenantAtime
()
{
return
subsLogTenantAtime
;
return
subsLogTenantAtime
;
}
}
/**
* 服务订阅添加时间
*/
public
void
setSubsLogTenantAtime
(
Timestamp
subsLogTenantAtime
)
{
public
void
setSubsLogTenantAtime
(
Timestamp
subsLogTenantAtime
)
{
this
.
subsLogTenantAtime
=
subsLogTenantAtime
;
this
.
subsLogTenantAtime
=
subsLogTenantAtime
;
}
}
public
Short
getIsDelete
()
{
return
isDelete
;
}
public
void
setIsDelete
(
Short
isDelete
)
{
this
.
isDelete
=
isDelete
;
}
@Override
@Override
public
boolean
equals
(
Object
that
)
{
public
boolean
equals
(
Object
that
)
{
...
@@ -337,7 +186,6 @@ public class OcpTenantSubs implements Serializable {
...
@@ -337,7 +186,6 @@ public class OcpTenantSubs implements Serializable {
sb
.
append
(
", subsLogTenantUserId="
).
append
(
subsLogTenantUserId
);
sb
.
append
(
", subsLogTenantUserId="
).
append
(
subsLogTenantUserId
);
sb
.
append
(
", subsLogTenantAtime="
).
append
(
subsLogTenantAtime
);
sb
.
append
(
", subsLogTenantAtime="
).
append
(
subsLogTenantAtime
);
sb
.
append
(
", isDelete="
).
append
(
isDelete
);
sb
.
append
(
", isDelete="
).
append
(
isDelete
);
sb
.
append
(
", serialVersionUID="
).
append
(
serialVersionUID
);
sb
.
append
(
"]"
);
sb
.
append
(
"]"
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
...
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
View file @
8a336758
...
@@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
...
@@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
/**
/**
* 新增服务分类
* 新增服务分类
*/
*/
boolean
insertTree
(
OcpApiGroup
ocpApiGroup
);
OcpApiGroup
insertTree
(
OcpApiGroup
ocpApiGroup
);
/*
/*
...
...
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
View file @
8a336758
...
@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.pms.ocp.common.utils.RandomStringUtils
;
import
com.pms.ocp.common.utils.RandomStringUtils
;
import
com.pms.ocp.mapper.OcpApiBaseMapper
;
import
com.pms.ocp.mapper.OcpApiBaseMapper
;
import
com.pms.ocp.mapper.OcpApiTreeMapper
;
import
com.pms.ocp.mapper.OcpApiTreeMapper
;
import
com.pms.ocp.model.QueryResponseResult
;
import
com.pms.ocp.model.dto.*
;
import
com.pms.ocp.model.dto.*
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
import
com.pms.ocp.service.OcpApiTreeService
;
import
com.pms.ocp.service.OcpApiTreeService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -25,7 +27,7 @@ import java.util.stream.Stream;
...
@@ -25,7 +27,7 @@ import java.util.stream.Stream;
@Service
@Service
@Slf4j
@Slf4j
public
class
OcpApiTreeServiceImpl
extends
ServiceImpl
<
OcpApiTreeMapper
,
OcpApiGroup
>
implements
OcpApiTreeService
{
public
class
OcpApiTreeServiceImpl
extends
ServiceImpl
<
OcpApiTreeMapper
,
OcpApiGroup
>
implements
OcpApiTreeService
{
@Autowired
@Autowired
...
@@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
...
@@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
*/
*/
@Override
@Override
public
List
<
OcpApiGroup
>
getByGroup
(
Long
apiGroupPromotionType
,
String
apiGroupCode
)
{
public
List
<
OcpApiGroup
>
getByGroup
(
Long
apiGroupPromotionType
,
String
apiGroupCode
)
{
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
StringUtils
.
isBlank
(
apiGroupCode
)){
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
StringUtils
.
isBlank
(
apiGroupCode
))
{
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectTwoApiGroups
(
apiGroupPromotionType
);
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectTwoApiGroups
(
apiGroupPromotionType
);
return
ocpApiGroups
;
return
ocpApiGroups
;
}
else
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
!(
StringUtils
.
isBlank
(
apiGroupCode
))){
}
else
if
(!(
""
.
equals
(
apiGroupPromotionType
))
&&
!(
StringUtils
.
isBlank
(
apiGroupCode
)))
{
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectThreeApiGroupsList
(
apiGroupPromotionType
,
apiGroupCode
);
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectThreeApiGroupsList
(
apiGroupPromotionType
,
apiGroupCode
);
return
ocpApiGroups
;
return
ocpApiGroups
;
}
return
null
;
}
}
return
null
;
}
/**
/**
* 新增服务分类
* 新增服务分类
...
@@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
...
@@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
* @param
* @param
*/
*/
@Override
@Override
public
boolean
insertTree
(
OcpApiGroup
ocpApiGroup
)
{
public
OcpApiGroup
insertTree
(
OcpApiGroup
ocpApiGroup
)
{
Timestamp
timestamp
=
new
Timestamp
(
System
.
currentTimeMillis
());
Timestamp
timestamp
=
new
Timestamp
(
System
.
currentTimeMillis
());
String
code
=
RandomStringUtils
.
getRandomString
(
6
);
String
code
=
RandomStringUtils
.
getRandomString
(
6
);
boolean
flag
=
true
;
boolean
flag
=
true
;
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectList
(
null
);
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectList
(
null
);
Stream
<
OcpApiGroup
>
ocpApiGroupStream
=
ocpApiGroups
.
stream
().
filter
(
item
->
item
.
getApiGroupCode
().
equals
(
ocpApiGroup
.
getApiGroupPcode
()));
Stream
<
OcpApiGroup
>
ocpApiGroupStream
=
ocpApiGroups
.
stream
().
filter
(
item
->
item
.
getApiGroupCode
().
equals
(
ocpApiGroup
.
getApiGroupPcode
()));
Stream
<
OcpApiGroup
>
apiGroupStream1
=
ocpApiGroupStream
.
filter
(
ocp
->
ocp
.
getApiGroupName
().
equals
(
ocpApiGroup
.
getApiGroupName
()));
Stream
<
OcpApiGroup
>
apiGroupStream1
=
ocpApiGroupStream
.
filter
(
ocp
->
ocp
.
getApiGroupName
().
equals
(
ocpApiGroup
.
getApiGroupName
()));
if
(!(
apiGroupStream1
.
isParallel
())){
OcpApiGroup
ocpApi
=
new
OcpApiGroup
();
OcpApiGroup
ocpApi
=
new
OcpApiGroup
();
if
(!(
StringUtils
.
isBlank
(
apiGroupStream1
.
toString
())))
{
BeanUtils
.
copyProperties
(
ocpApiGroup
,
ocpApi
);
ocpApi
.
setApiGroupPromotionType
(
ocpApiGroup
.
getApiGroupPromotionType
());
ocpApi
.
setApiGroupPromotionType
(
ocpApiGroup
.
getApiGroupPromotionType
());
BeanUtils
.
copyProperties
(
ocpApiGroup
,
ocpApi
);
ocpApi
.
setObjId
(
""
);
ocpApi
.
setObjId
(
""
);
ocpApi
.
setApiGroupMtime
(
timestamp
);
ocpApi
.
setApiGroupMtime
(
timestamp
);
ocpApi
.
setApiGroupCtime
(
timestamp
);
ocpApi
.
setApiGroupCtime
(
timestamp
);
ocpApi
.
setApiGroupPcode
(
ocpApiGroup
.
getApiGroupCode
());
ocpApi
.
setApiGroupPcode
(
ocpApiGroup
.
getApiGroupCode
());
ocpApi
.
setApiGroupCode
(
code
);
ocpApi
.
setApiGroupCode
(
code
);
if
(
ocpApiGroup
.
getApiGroupLevel
().
equals
(
"Middleground"
)){
ocpApi
.
setApiGroupPromotionType
(
ocpApiGroup
.
getApiGroupPromotionType
());
if
(
"Middleground"
.
equals
(
ocpApiGroup
.
getApiGroupLevel
()))
{
ocpApiGroup
.
setApiGroupLevel
(
"sys_center"
);
ocpApiGroup
.
setApiGroupLevel
(
"sys_center"
);
}
}
if
(
ocpApiGroup
.
getApiGroupLevel
().
equals
(
"sys_center"
))
{
if
(
"sys_center"
.
equals
(
ocpApiGroup
.
getApiGroupLevel
()))
{
ocpApiGroup
.
setApiGroupLevel
(
"api_group"
);
ocpApiGroup
.
setApiGroupLevel
(
"api_group"
);
}
}
mapper
.
insert
(
ocpApi
);
mapper
.
insert
(
ocpApi
);
}
else
{
}
else
{
return
ocpApi
;
return
false
;
}
}
return
flag
;
return
ocpApi
;
}
}
...
@@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
...
@@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
* @param ocpApiGroup
* @param ocpApiGroup
*/
*/
@Override
@Override
public
boolean
deleteOcpTree
(
OcpApiGroup
ocpApiGroup
)
{
public
boolean
deleteOcpTree
(
OcpApiGroup
ocpApiGroup
)
{
boolean
flag
=
true
;
boolean
flag
=
true
;
LambdaQueryWrapper
<
OcpApiGroup
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
OcpApiGroup:
:
getApiGroupCode
,
ocpApiGroup
.
getApiGroupCode
());
String
objId
=
ocpApiGroup
.
getObjId
();
String
objId
=
ocpApiGroup
.
getObjId
();
OcpApiGroup
ocpApiGroup1
=
mapper
.
selectById
(
objId
);
if
(
StringUtils
.
isBlank
(
ocpApiGroup
.
getApiGroupCode
()))
{
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectList
(
null
);
flag
=
false
;
for
(
OcpApiGroup
apiGroup
:
ocpApiGroups
)
{
}
else
{
if
((
ocpApiGroup1
.
getApiGroupCode
()).
equals
(
apiGroup
.
getApiGroupPcode
())){
flag
=
false
;
LambdaQueryWrapper
<
OcpApiGroup
>
eq
=
queryWrapper
.
eq
(
OcpApiGroup:
:
getApiGroupPcode
,
ocpApiGroup
.
getApiGroupCode
());
break
;
if
(
StringUtils
.
isBlank
(
eq
.
toString
()))
{
}
flag
=
false
;
}
}
}
if
(
flag
){
if
(
flag
)
{
mapper
.
deleteById
(
objId
);
mapper
.
deleteById
(
objId
);
}
}
return
flag
;
return
flag
;
...
@@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
...
@@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
*/
*/
@Override
@Override
public
Page
<
OcpApiGroup
>
getOnePages
(
PageGroupDto
pageGroupDto
)
{
public
Page
<
OcpApiGroup
>
getOnePages
(
PageGroupDto
pageGroupDto
)
{
Page
pageInfo
=
new
Page
(
pageGroupDto
.
getPageNum
(),
pageGroupDto
.
getPageSize
());
Page
pageInfo
=
new
Page
(
pageGroupDto
.
getPageNum
(),
pageGroupDto
.
getPageSize
());
if
(
StringUtils
.
isBlank
(
pageGroupDto
.
getApiGroupCode
())){
LambdaQueryWrapper
<
OcpApiGroup
>
qw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
OcpApiGroup
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
();
if
(!(
""
.
equals
(
pageGroupDto
.
getKeyword
())))
{
lambdaQueryWrapper
.
eq
(
OcpApiGroup:
:
getApiGroupPromotionType
,
pageGroupDto
.
getApiGroupPromotionType
());
if
(
StringUtils
.
isBlank
(
pageGroupDto
.
getApiGroupLevel
()))
{
pageInfo
=
mapper
.
selectPage
(
pageInfo
,
lambdaQueryWrapper
);
}
else
if
(!(
StringUtils
.
isBlank
(
pageGroupDto
.
getApiGroupCode
()))){
qw
.
eq
(
OcpApiGroup:
:
getApiGroupPromotionType
,
pageGroupDto
.
getApiGroupPromotionType
());
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectLists
(
pageGroupDto
.
getApiGroupPromotionType
(),
pageGroupDto
.
getApiGroupCode
(),
pageGroupDto
.
getApiGroupLevel
());
mapper
.
selectPage
(
pageInfo
,
qw
);
pageInfo
.
setRecords
(
ocpApiGroups
);
pageInfo
=
mapper
.
selectPage
(
pageInfo
,
null
);
}
else
if
(
"Middleground"
.
equals
(
pageGroupDto
.
getApiGroupLevel
())
||
"sys_center"
.
equals
(
pageGroupDto
.
getApiGroupLevel
())
||
"api_group"
.
equals
(
pageGroupDto
.
getApiGroupLevel
()))
{
List
<
OcpApiGroup
>
ocpApiGroups
=
mapper
.
selectLists
(
pageGroupDto
.
getApiGroupPromotionType
(),
pageGroupDto
.
getApiGroupCode
());
pageInfo
.
setRecords
(
ocpApiGroups
);
pageInfo
.
setTotal
(
ocpApiGroups
.
size
());
}
}
else
{
LambdaQueryWrapper
<
OcpApiGroup
>
ocpTenantGroupLambdaQueryWrapper
=
qw
.
and
(
c
->
c
.
like
(
OcpApiGroup:
:
getApiGroupName
,
pageGroupDto
.
getKeyword
()))
.
or
().
like
(
OcpApiGroup:
:
getApiGroupUserName
,
pageGroupDto
.
getKeyword
())
.
or
().
like
(
OcpApiGroup:
:
getApiGroupPcode
,
pageGroupDto
.
getKeyword
());
mapper
.
selectPage
(
pageInfo
,
ocpTenantGroupLambdaQueryWrapper
);
}
}
return
pageInfo
;
return
pageInfo
;
}
}
}
}
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
View file @
8a336758
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.pms.ocp.mapper.OcpTenantAuditMapper
;
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
;
...
@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
...
@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
private
OcpTenantGroupService
ocpTenantGroupService
;
private
OcpTenantGroupService
ocpTenantGroupService
;
@Autowired
@Autowired
private
OcpTenantGroupMapper
ocpTenantGroupMapper
;
private
OcpTenantGroupMapper
ocpTenantGroupMapper
;
@Autowired
private
OcpTenantAuditMapper
ocpTenantAuditMapper
;
List
<
String
>
tenantGroup
=
new
ArrayList
<>();
List
<
String
>
tenantGroup
=
new
ArrayList
<>();
...
@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
...
@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
List
<
OcpTenantExtent
>
ocpTenantExtents
=
ocpTenantExtentMapper
.
selectList
(
lambdaQueryWrapper
);
List
<
OcpTenantExtent
>
ocpTenantExtents
=
ocpTenantExtentMapper
.
selectList
(
lambdaQueryWrapper
);
for
(
OcpTenantExtent
ocpTenantExtent
:
ocpTenantExtents
)
{
for
(
OcpTenantExtent
ocpTenantExtent
:
ocpTenantExtents
)
{
String
tenantCode
=
ocpTenantExtent
.
getTenantCode
();
String
tenantCode
=
ocpTenantExtent
.
getTenantCode
();
if
(
ocpTenantExtent
.
getTenantState
()
==
0
)
{
if
(
ocpTenantExtent
.
getTenantState
()
==
null
)
{
return
ResponseVO
.
error
(
"数据为空"
);
return
ResponseVO
.
error
(
"数据
错误,状态
为空"
);
}
else
if
(
ocpTenantExtent
.
getTenantState
()
==
1
)
{
}
else
if
(
ocpTenantExtent
.
getTenantState
()
==
1
)
{
return
ResponseVO
.
error
(
tenantCode
+
"已发布,请勿重复操作"
);
return
ResponseVO
.
error
(
tenantCode
+
"已发布,请勿重复操作"
);
}
else
{
}
// else if (ocpTenantExtent.getTenantState() == 2) {
// return ResponseVO.error(tenantCode + "已下线,无法发布");
// }
else
{
ocpTenantExtent
.
setTenantState
((
short
)
1
);
ocpTenantExtent
.
setTenantState
((
short
)
1
);
ocpTenantExtentMapper
.
updateById
(
ocpTenantExtent
);
ocpTenantExtentMapper
.
updateById
(
ocpTenantExtent
);
}
}
...
@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
...
@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
String
[]
split
=
tenantCodes
.
split
(
","
);
String
[]
split
=
tenantCodes
.
split
(
","
);
List
<
String
>
list
=
Arrays
.
asList
(
split
);
List
<
String
>
list
=
Arrays
.
asList
(
split
);
LambdaQueryWrapper
<
OcpTenantExtent
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
in
(
OcpTenantExtent:
:
getTenantCode
,
list
);
// LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
List
<
OcpTenantExtent
>
ocpTenantExtents
=
ocpTenantExtentMapper
.
selectList
(
lambdaQueryWrapper
);
// lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
// List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
LambdaQueryWrapper
<
OcpTenantAudit
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
in
(
OcpTenantAudit:
:
getTenantCode
,
list
);
List
<
OcpTenantAudit
>
ocpTenantExtents
=
ocpTenantAuditMapper
.
selectList
(
lambdaQueryWrapper
);
if
(
ocpTenantExtents
.
size
()
==
0
)
{
if
(
ocpTenantExtents
.
size
()
==
0
)
{
return
ResponseVO
.
error
(
"数据为空"
);
return
ResponseVO
.
error
(
"
系统错误,
数据为空"
);
}
}
for
(
OcpTenant
Exten
t
ocpTenantExtent
:
ocpTenantExtents
)
{
for
(
OcpTenant
Audi
t
ocpTenantExtent
:
ocpTenantExtents
)
{
String
tenantCode
=
ocpTenantExtent
.
getTenantCode
();
String
tenantCode
=
ocpTenantExtent
.
getTenantCode
();
if
(
ocpTenantExtent
.
get
TenantState
()
==
null
)
{
if
(
ocpTenantExtent
.
get
OperStatus
()
==
null
)
{
return
ResponseVO
.
error
(
"系统错误,状态为空"
);
return
ResponseVO
.
error
(
"系统错误,状态为空"
);
}
else
if
(
ocpTenantExtent
.
get
TenantState
()
==
2
)
{
}
else
if
(
ocpTenantExtent
.
get
OperStatus
()
==
2
)
{
return
ResponseVO
.
error
(
tenantCode
+
"已下线,请勿重复下线"
);
return
ResponseVO
.
error
(
tenantCode
+
"已下线,请勿重复下线"
);
}
else
{
}
else
{
ocpTenantExtent
.
set
TenantState
((
short
)
2
);
ocpTenantExtent
.
set
OperStatus
((
short
)
2
);
ocpTenant
Exten
tMapper
.
updateById
(
ocpTenantExtent
);
ocpTenant
Audi
tMapper
.
updateById
(
ocpTenantExtent
);
}
}
}
}
...
...
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
View file @
8a336758
...
@@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
...
@@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
if
(
tenanBaseDto
.
getTenantGroupLevel
().
equals
(
"sys_center"
)){
if
(
tenanBaseDto
.
getTenantGroupLevel
().
equals
(
"sys_center"
)){
group
.
setTenantGroupLevel
(
"api_group"
);
group
.
setTenantGroupLevel
(
"api_group"
);
}
}
group
.
setClassIfy
(
tenanBaseDto
.
getTenantGroupCompanyCode
());
//判断是否含有相同的分类名称
//判断是否含有相同的分类名称
if
(
falg
)
{
if
(
falg
)
{
...
...
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