Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
39e207e3
Commit
39e207e3
authored
Feb 03, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试服务-多副本场景
parent
7bff3d7d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
9 deletions
+76
-9
TSettleDomainUpServerTeamVo.java
...plus/v1/yifu/archives/vo/TSettleDomainUpServerTeamVo.java
+28
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+19
-0
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+2
-0
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+27
-9
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainUpServerTeamVo.java
0 → 100644
View file @
39e207e3
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author fxj
* @Date 2022/11/23
* @Description
* @Version 1.0
*/
@Data
public
class
TSettleDomainUpServerTeamVo
implements
Serializable
{
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
private
String
departNo
;
/**
* EKP的服务团队 : 存
*/
@Schema
(
description
=
"EKP的服务团队"
,
name
=
"serviceTeam"
)
private
String
serviceTeam
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
39e207e3
...
...
@@ -378,4 +378,23 @@ public class TSettleDomainController {
List
<
TSettleDomainUpdVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TSettleDomainUpdVo
.
class
);
return
tSettleDomainService
.
updateProjectStopStatus
(
list
);
}
/**
* 修改项目表--EKP调用接口
* @author fxj
* @param jsonStr
* @return R
*/
@Operation
(
summary
=
"更新项目服务团队--EKP调用接口"
,
description
=
"更新项目服务团队--EKP调用接口"
)
@SysLog
(
"更新项目服务团队--EKP调用接口"
)
@PostMapping
(
"/updateProjectServerTeam"
)
public
R
<
Boolean
>
updateProjectServerTeam
(
@RequestBody
String
jsonStr
)
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
}
List
<
TSettleDomainUpServerTeamVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TSettleDomainUpServerTeamVo
.
class
);
return
tSettleDomainService
.
updateProjectServerTeam
(
list
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
39e207e3
...
...
@@ -122,4 +122,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
List
<
TCustomerInfo
>
getTCustomerInfoForB
(
List
<
String
>
customerList
);
R
<
IPage
<
CustomerOwnerSelectVo
>>
getCustomerOwnerPage
(
Page
<
CustomerOwnerSelectVo
>
page
,
String
customerName
,
String
userId
);
R
<
Boolean
>
updateProjectServerTeam
(
List
<
TSettleDomainUpServerTeamVo
>
list
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
39e207e3
...
...
@@ -182,7 +182,6 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return
R
.
failed
(
"获取区域数据失败!"
);
}
Map
<
String
,
String
>
areaMap
=
areaListR
.
getData
().
getLabelIdMap
();
R
<
SysUserListVo
>
res
;
String
errorStr
;
TSettleDomain
domain
;
for
(
TSettleDomainEkpVo
vo:
list
)
{
...
...
@@ -206,14 +205,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
domain
.
setId
(
tSettleDomainInfo
.
getId
());
}
// 处理服务团队数据权限 2022-09-19 fxj
if
(
Common
.
isNotNull
(
domain
.
getServiceTeam
())){
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getServiceTeam
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
// 先清理缓存
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
saveForEkp
(
res
.
getData
().
getUserList
(),
domain
);
}
}
initServerTeamPermission
(
domain
);
domain
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
if
(
Common
.
isNotNull
(
tSettleDomainInfo
))
{
baseMapper
.
updateById
(
domain
);
...
...
@@ -472,4 +464,30 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
String
userId
)
{
return
R
.
ok
(
baseMapper
.
getCustomerOwnerPage
(
page
,
customerName
,
userId
));
}
/**
* @Author fxj
* @Description 更新服务团队人员权限
* @Date 11:23 2023/2/3
**/
@Override
public
R
<
Boolean
>
updateProjectServerTeam
(
List
<
TSettleDomainUpServerTeamVo
>
list
)
{
TSettleDomain
domain
;
for
(
TSettleDomainUpServerTeamVo
vo:
list
)
{
domain
=
new
TSettleDomain
();
BeanUtil
.
copyProperties
(
vo
,
domain
);
initServerTeamPermission
(
domain
);
}
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
}
private
void
initServerTeamPermission
(
TSettleDomain
domain
)
{
if
(
Common
.
isNotNull
(
domain
.
getServiceTeam
())){
R
<
SysUserListVo
>
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getServiceTeam
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
// 先清理缓存
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
saveForEkp
(
res
.
getData
().
getUserList
(),
domain
);
}
}
}
}
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