Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-auth
Commits
7d4c0414
Commit
7d4c0414
authored
Mar 01, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资源组是否已经联合授权接口调整
parent
9ddd993a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
317 additions
and
1 deletions
+317
-1
ResourceController.java
.../java/com/gic/auth/web/controller/ResourceController.java
+14
-1
UnionEnterpriseAuthVO.java
.../main/java/com/gic/auth/web/vo/UnionEnterpriseAuthVO.java
+303
-0
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
View file @
7d4c0414
...
@@ -8,6 +8,7 @@ import com.gic.auth.dto.UserDTO;
...
@@ -8,6 +8,7 @@ import com.gic.auth.dto.UserDTO;
import
com.gic.auth.service.AuthCodeApiService
;
import
com.gic.auth.service.AuthCodeApiService
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.enterprise.dto.EnterpriseDTO
;
import
com.gic.enterprise.dto.EnterpriseDTO
;
import
com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.exception.CommonException
;
import
com.gic.enterprise.exception.CommonException
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
...
@@ -119,7 +120,19 @@ public class ResourceController {
...
@@ -119,7 +120,19 @@ public class ResourceController {
*/
*/
@RequestMapping
(
"/has-auth-union-enterprise"
)
@RequestMapping
(
"/has-auth-union-enterprise"
)
public
RestResponse
hasAuthUnionEnterprise
(
Integer
resourceGroupId
)
{
public
RestResponse
hasAuthUnionEnterprise
(
Integer
resourceGroupId
)
{
return
ResultControllerUtils
.
commonResult
(
unionEnterpriseAuthApiService
.
getUnionEnterpriseAuthByResourceGroupId
(
resourceGroupId
));
ServiceResponse
<
UnionEnterpriseAuthDTO
>
response
=
unionEnterpriseAuthApiService
.
getUnionEnterpriseAuthByResourceGroupId
(
resourceGroupId
);
if
(
response
.
isSuccess
())
{
UnionEnterpriseAuthDTO
dto
=
response
.
getResult
();
if
(
dto
!=
null
)
{
UnionEnterpriseAuthVO
vo
=
EntityUtil
.
changeEntityNew
(
UnionEnterpriseAuthVO
.
class
,
dto
);
ServiceResponse
<
EnterpriseDTO
>
enterpriseResponse
=
enterpriseApiService
.
getEnterpriseById
(
vo
.
getUnionEnterpriseId
());
vo
.
setUnionEnterpriseName
(
enterpriseResponse
.
getResult
().
getEnterpriseName
());
return
RestResponse
.
success
(
vo
);
}
else
{
return
RestResponse
.
success
();
}
}
return
RestResponse
.
failure
(
response
.
getCode
(),
response
.
getMessage
());
}
}
@RequestMapping
(
"send-auth-code-to-union-enterprise"
)
@RequestMapping
(
"send-auth-code-to-union-enterprise"
)
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/UnionEnterpriseAuthVO.java
0 → 100644
View file @
7d4c0414
package
com
.
gic
.
auth
.
web
.
vo
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 联合商户名称
* @ClassName:
* @Description:
* @author guojuxing
* @date 2021/3/1 10:14 AM
*/
public
class
UnionEnterpriseAuthVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
5630331976878779269L
;
/**
* id
*/
private
Integer
unionEnterpriseAuthId
;
/**
* 自有商户ID
*/
private
Integer
ownEnterpriseId
;
/**
* 联合商户ID
*/
private
Integer
unionEnterpriseId
;
private
String
unionEnterpriseName
;
/**
* 1:有效 2:解除中 3: 已解除联合
*/
private
Integer
statusFlag
;
/**
* 最新联合完成时间(最后一项资源授权完毕时间)
*/
private
Date
lastUnionTime
;
/**
* 最新解除时间(最后一项资源收回完毕时间)
*/
private
Date
lastRelieveTime
;
/**
* 解除时间
*/
private
Date
relieveTime
;
/**
* 解除生效时间,保留X个自然日后开始解除资源
*/
private
Integer
relieveEffectDate
;
/**
* 解除原因备注
*/
private
String
relieveRemark
;
/**
* 资源组ID
*/
private
Integer
resourceGroupId
;
/**
* 受审组,多选,英文逗号隔开
*/
private
String
auditeeGroup
;
/**
* 账号分组,多选,英文逗号隔开
*/
private
String
accountGroup
;
/**
* 数据加密字段 1:用户手机号、卡号 2:用户收获地址 。多选,英文逗号隔开
*/
private
String
dataEncryField
;
/**
* 用户修改权限 1:用户归属修改权限 2:用户等级修改权限 3:用户积分修改权限 4:用户手机号修改权限 。多选,英文逗号隔开
*/
private
String
userEditAuth
;
/**
* 白名单用户授权 1:是 0:否
*/
private
Integer
whiteListAuth
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
updateTime
;
/**
* 状态(0:正常;1:删除)
*/
private
Integer
deleteFlag
;
public
Integer
getUnionEnterpriseAuthId
()
{
return
unionEnterpriseAuthId
;
}
public
UnionEnterpriseAuthVO
setUnionEnterpriseAuthId
(
Integer
unionEnterpriseAuthId
)
{
this
.
unionEnterpriseAuthId
=
unionEnterpriseAuthId
;
return
this
;
}
public
Integer
getOwnEnterpriseId
()
{
return
ownEnterpriseId
;
}
public
UnionEnterpriseAuthVO
setOwnEnterpriseId
(
Integer
ownEnterpriseId
)
{
this
.
ownEnterpriseId
=
ownEnterpriseId
;
return
this
;
}
public
Integer
getUnionEnterpriseId
()
{
return
unionEnterpriseId
;
}
public
UnionEnterpriseAuthVO
setUnionEnterpriseId
(
Integer
unionEnterpriseId
)
{
this
.
unionEnterpriseId
=
unionEnterpriseId
;
return
this
;
}
public
String
getUnionEnterpriseName
()
{
return
unionEnterpriseName
;
}
public
UnionEnterpriseAuthVO
setUnionEnterpriseName
(
String
unionEnterpriseName
)
{
this
.
unionEnterpriseName
=
unionEnterpriseName
;
return
this
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
UnionEnterpriseAuthVO
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
return
this
;
}
public
Date
getLastUnionTime
()
{
return
lastUnionTime
;
}
public
UnionEnterpriseAuthVO
setLastUnionTime
(
Date
lastUnionTime
)
{
this
.
lastUnionTime
=
lastUnionTime
;
return
this
;
}
public
Date
getLastRelieveTime
()
{
return
lastRelieveTime
;
}
public
UnionEnterpriseAuthVO
setLastRelieveTime
(
Date
lastRelieveTime
)
{
this
.
lastRelieveTime
=
lastRelieveTime
;
return
this
;
}
public
Date
getRelieveTime
()
{
return
relieveTime
;
}
public
UnionEnterpriseAuthVO
setRelieveTime
(
Date
relieveTime
)
{
this
.
relieveTime
=
relieveTime
;
return
this
;
}
public
Integer
getRelieveEffectDate
()
{
return
relieveEffectDate
;
}
public
UnionEnterpriseAuthVO
setRelieveEffectDate
(
Integer
relieveEffectDate
)
{
this
.
relieveEffectDate
=
relieveEffectDate
;
return
this
;
}
public
String
getRelieveRemark
()
{
return
relieveRemark
;
}
public
UnionEnterpriseAuthVO
setRelieveRemark
(
String
relieveRemark
)
{
this
.
relieveRemark
=
relieveRemark
;
return
this
;
}
public
Integer
getResourceGroupId
()
{
return
resourceGroupId
;
}
public
UnionEnterpriseAuthVO
setResourceGroupId
(
Integer
resourceGroupId
)
{
this
.
resourceGroupId
=
resourceGroupId
;
return
this
;
}
public
String
getAuditeeGroup
()
{
return
auditeeGroup
;
}
public
UnionEnterpriseAuthVO
setAuditeeGroup
(
String
auditeeGroup
)
{
this
.
auditeeGroup
=
auditeeGroup
;
return
this
;
}
public
String
getAccountGroup
()
{
return
accountGroup
;
}
public
UnionEnterpriseAuthVO
setAccountGroup
(
String
accountGroup
)
{
this
.
accountGroup
=
accountGroup
;
return
this
;
}
public
String
getDataEncryField
()
{
return
dataEncryField
;
}
public
UnionEnterpriseAuthVO
setDataEncryField
(
String
dataEncryField
)
{
this
.
dataEncryField
=
dataEncryField
;
return
this
;
}
public
String
getUserEditAuth
()
{
return
userEditAuth
;
}
public
UnionEnterpriseAuthVO
setUserEditAuth
(
String
userEditAuth
)
{
this
.
userEditAuth
=
userEditAuth
;
return
this
;
}
public
Integer
getWhiteListAuth
()
{
return
whiteListAuth
;
}
public
UnionEnterpriseAuthVO
setWhiteListAuth
(
Integer
whiteListAuth
)
{
this
.
whiteListAuth
=
whiteListAuth
;
return
this
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
UnionEnterpriseAuthVO
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
return
this
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
UnionEnterpriseAuthVO
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
return
this
;
}
public
Integer
getDeleteFlag
()
{
return
deleteFlag
;
}
public
UnionEnterpriseAuthVO
setDeleteFlag
(
Integer
deleteFlag
)
{
this
.
deleteFlag
=
deleteFlag
;
return
this
;
}
@Override
public
String
toString
()
{
return
"UnionEnterpriseAuthVO{"
+
"unionEnterpriseAuthId="
+
unionEnterpriseAuthId
+
", ownEnterpriseId="
+
ownEnterpriseId
+
", unionEnterpriseId="
+
unionEnterpriseId
+
", unionEnterpriseName='"
+
unionEnterpriseName
+
'\''
+
", statusFlag="
+
statusFlag
+
", lastUnionTime="
+
lastUnionTime
+
", lastRelieveTime="
+
lastRelieveTime
+
", relieveTime="
+
relieveTime
+
", relieveEffectDate="
+
relieveEffectDate
+
", relieveRemark='"
+
relieveRemark
+
'\''
+
", resourceGroupId="
+
resourceGroupId
+
", auditeeGroup='"
+
auditeeGroup
+
'\''
+
", accountGroup='"
+
accountGroup
+
'\''
+
", dataEncryField='"
+
dataEncryField
+
'\''
+
", userEditAuth='"
+
userEditAuth
+
'\''
+
", whiteListAuth="
+
whiteListAuth
+
", createTime="
+
createTime
+
", updateTime="
+
updateTime
+
", deleteFlag="
+
deleteFlag
+
'}'
;
}
}
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