Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
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
李丛阳
education
Commits
70503703
Commit
70503703
authored
Apr 17, 2020
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限验证接口 参数类型变化Long-String
parent
bb9d21d7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
31 deletions
+31
-31
MicroappFeignClientFallBack.java
...oft/common/util/fallback/MicroappFeignClientFallBack.java
+1
-1
MicroappFeignClient.java
.../rcisoft/common/util/feignClient/MicroappFeignClient.java
+1
-1
HaveJurisdictionReqDTO.java
.../rcisoft/common/util/feignDto/HaveJurisdictionReqDTO.java
+4
-4
MTUserGetsAccountReqDTO.java
...rcisoft/common/util/feignDto/MTUserGetsAccountReqDTO.java
+1
-1
MTMicroappApiRequestClient.java
...oft/common/util/outClient/MTMicroappApiRequestClient.java
+18
-18
MTNotificationApiRequestClient.java
...common/util/outClient/MTNotificationApiRequestClient.java
+6
-6
No files found.
src/main/java/org/rcisoft/common/util/fallback/MicroappFeignClientFallBack.java
View file @
70503703
...
...
@@ -28,7 +28,7 @@ public class MicroappFeignClientFallBack implements MicroappFeignClient {
}
@Override
public
Ret
<
List
<
Lo
ng
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
String
zxClientType
,
Long
zxAccountId
)
{
public
Ret
<
List
<
Stri
ng
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
String
zxClientType
,
Long
zxAccountId
)
{
log
.
error
(
"---------------调智信接口 /micro_app/haveJurisdictionUserFast(筛选有通知权限的人-优化) 失败-------------------"
);
...
...
src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java
View file @
70503703
...
...
@@ -49,7 +49,7 @@ public interface MicroappFeignClient {
* @return
*/
@RequestMapping
(
value
=
"/micro_app/haveJurisdictionUserFast"
,
method
=
RequestMethod
.
POST
)
Ret
<
List
<
Lo
ng
>>
haveJurisdictionUserFast
(
@RequestBody
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
Ret
<
List
<
Stri
ng
>>
haveJurisdictionUserFast
(
@RequestBody
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
...
...
src/main/java/org/rcisoft/common/util/feignDto/HaveJurisdictionReqDTO.java
View file @
70503703
...
...
@@ -13,15 +13,15 @@ import java.util.List;
public
class
HaveJurisdictionReqDTO
{
@NotNull
private
Lo
ng
corpId
;
private
Stri
ng
corpId
;
@NotNull
private
List
<
Lo
ng
>
userIds
;
private
List
<
Stri
ng
>
userIds
;
@NotNull
private
Lo
ng
appId
;
private
Stri
ng
appId
;
public
HaveJurisdictionReqDTO
(
Long
corpId
,
List
<
Lo
ng
>
userIds
){
public
HaveJurisdictionReqDTO
(
String
corpId
,
List
<
Stri
ng
>
userIds
){
this
.
corpId
=
corpId
;
this
.
userIds
=
userIds
;
}
...
...
src/main/java/org/rcisoft/common/util/feignDto/MTUserGetsAccountReqDTO.java
View file @
70503703
...
...
@@ -13,6 +13,6 @@ public class MTUserGetsAccountReqDTO {
private
String
corpId
;
private
List
<
Lo
ng
>
userIds
;
private
List
<
Stri
ng
>
userIds
;
}
src/main/java/org/rcisoft/common/util/outClient/MTMicroappApiRequestClient.java
View file @
70503703
...
...
@@ -27,28 +27,28 @@ public class MTMicroappApiRequestClient {
public
static
Long
zxAccountId
=
(
long
)
1
;
@Value
(
"${appId.noticeAppId}"
)
private
Lo
ng
appId
;
private
Stri
ng
appId
;
@Autowired
private
MicroappFeignClient
microappFeignClient
;
public
boolean
isHaveApps
(
long
userId
,
long
corpId
)
{
Ret
ret
=
microappFeignClient
.
isHaveApps
(
userId
,
corpId
,
appId
,
zxClientType
,
zxAccountId
);
if
(
ret
!=
null
&&
"M0000"
.
equals
(
ret
.
getCode
())){
return
(
boolean
)
ret
.
getData
();
}
return
false
;
}
public
Ret
haveJurisdictionUser
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
)
{
haveJurisdictionReqDTO
.
setAppId
(
appId
);
Ret
ret
=
microappFeignClient
.
haveJurisdictionUser
(
haveJurisdictionReqDTO
,
zxClientType
,
zxAccountId
);
return
ret
;
}
public
Ret
<
List
<
Lo
ng
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
)
{
//
//
public boolean isHaveApps(long userId, long corpId) {
//
Ret ret = microappFeignClient.isHaveApps(userId,corpId,appId,zxClientType,zxAccountId);
//
if(ret != null && "M0000".equals(ret.getCode())){
//
return (boolean) ret.getData();
//
}
//
return false;
//
}
//
//
public Ret haveJurisdictionUser(HaveJurisdictionReqDTO haveJurisdictionReqDTO) {
//
haveJurisdictionReqDTO.setAppId(appId);
//
Ret ret = microappFeignClient.haveJurisdictionUser(haveJurisdictionReqDTO,zxClientType,zxAccountId);
//
return ret;
//
}
public
Ret
<
List
<
Stri
ng
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
)
{
haveJurisdictionReqDTO
.
setAppId
(
appId
);
Ret
<
List
<
Lo
ng
>>
ret
=
microappFeignClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
,
zxClientType
,
zxAccountId
);
Ret
<
List
<
Stri
ng
>>
ret
=
microappFeignClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
,
zxClientType
,
zxAccountId
);
return
ret
;
}
...
...
src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java
View file @
70503703
...
...
@@ -126,20 +126,20 @@ public class MTNotificationApiRequestClient {
if
(
null
!=
message
.
getRecipientIds
()
&&
message
.
getRecipientIds
().
size
()
>
0
&&
message
.
getRecipientIds
().
get
(
0
)
!=
null
)
{
List
<
Long
>
recipientIdLong
List
=
new
ArrayList
<>();
List
<
String
>
recipientId
List
=
new
ArrayList
<>();
message
.
getRecipientIds
().
forEach
(
recipientId
->
{
recipientIdL
ongList
.
add
(
Long
.
parseLong
(
recipientId
)
);
recipientIdL
ist
.
add
(
recipientId
);
});
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
=
new
HaveJurisdictionReqDTO
(
Long
.
parseLong
(
message
.
getCorpId
()),
recipientIdLong
List
);
log
.
debug
(
"----------------------通知-权限验证---------------------"
);
Ret
<
List
<
Lo
ng
>>
haveJurisList
=
microappApiRequestClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
);
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
=
new
HaveJurisdictionReqDTO
(
message
.
getCorpId
(),
recipientId
List
);
log
.
debug
(
"----------------------通知-权限验证---------------------"
+
haveJurisdictionReqDTO
);
Ret
<
List
<
Stri
ng
>>
haveJurisList
=
microappApiRequestClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
);
log
.
debug
(
"----------------------通知-权限验证返回结果----------------------"
+
haveJurisList
.
getData
());
if
(
haveJurisList
.
getData
()
==
null
||
haveJurisList
.
getData
().
size
()
<
1
){
return
false
;
}
List
<
String
>
haveJurisAccountIds
=
new
ArrayList
<>();
// List<String> getUserAccountList = new ArrayList<>();
List
<
Lo
ng
>
getUserAccountLongList
=
haveJurisList
.
getData
();
List
<
Stri
ng
>
getUserAccountLongList
=
haveJurisList
.
getData
();
// getUserAccountLongList.forEach(getUserAccount ->{
// getUserAccountList.add(String.valueOf(getUserAccount));
// });
...
...
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