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
5636a627
Commit
5636a627
authored
Mar 20, 2020
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mt后台调通
parent
9901faa4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
18 deletions
+11
-18
ContactFeignClient.java
...g/rcisoft/common/util/feignClient/ContactFeignClient.java
+2
-2
MicroappFeignClient.java
.../rcisoft/common/util/feignClient/MicroappFeignClient.java
+3
-2
NotificationFeignClient.java
...soft/common/util/feignClient/NotificationFeignClient.java
+3
-2
MTCotactApiRequestClient.java
...isoft/common/util/outClient/MTCotactApiRequestClient.java
+1
-10
MTNotificationApiRequestClient.java
...common/util/outClient/MTNotificationApiRequestClient.java
+2
-2
No files found.
src/main/java/org/rcisoft/common/util/feignClient/ContactFeignClient.java
View file @
5636a627
...
@@ -67,7 +67,7 @@ public interface ContactFeignClient {
...
@@ -67,7 +67,7 @@ public interface ContactFeignClient {
/**
/**
* 根据用户id获取用户信息(多个)
* 根据用户id获取用户信息(多个)
*/
*/
@RequestMapping
(
value
=
"/account/get_user_head"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/account/get_user_head"
,
method
=
RequestMethod
.
POST
,
consumes
=
MediaType
.
APPLICATION_JSON_VALUE
)
Ret
<
List
<
MTAccountIdRspDTO
>>
accountGetUserHead
(
@RequestBody
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
,
Ret
<
List
<
MTAccountIdRspDTO
>>
accountGetUserHead
(
@RequestBody
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
...
@@ -243,7 +243,7 @@ public interface ContactFeignClient {
...
@@ -243,7 +243,7 @@ public interface ContactFeignClient {
/**
/**
* 根据部门ids 获取部门及子部门多有人员id(未去重)
* 根据部门ids 获取部门及子部门多有人员id(未去重)
*/
*/
@RequestMapping
(
value
=
"/api/sm/user/get_sub_userIds_by_dept_ids"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/api/sm/user/get_sub_userIds_by_dept_ids"
,
method
=
RequestMethod
.
POST
,
consumes
=
MediaType
.
APPLICATION_JSON_VALUE
)
Ret
<
List
<
String
>>
getSubUserIdsByDeptIds
(
@RequestBody
GetSubUserIdsByDeptIdsReqDTO
getSubUserIdsByDeptIdsReqDTO
,
Ret
<
List
<
String
>>
getSubUserIdsByDeptIds
(
@RequestBody
GetSubUserIdsByDeptIdsReqDTO
getSubUserIdsByDeptIdsReqDTO
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
...
...
src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java
View file @
5636a627
...
@@ -5,6 +5,7 @@ import org.rcisoft.common.util.feignDto.HaveJurisdictionReqDTO;
...
@@ -5,6 +5,7 @@ import org.rcisoft.common.util.feignDto.HaveJurisdictionReqDTO;
import
org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO
;
import
org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO
;
import
org.rcisoft.core.result.Ret
;
import
org.rcisoft.core.result.Ret
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
...
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
...
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
/**
/**
* 智信消息客户端接口
* 智信消息客户端接口
*/
*/
@FeignClient
(
value
=
"
ZX-MICROAPP
"
,
fallback
=
MicroappFeignClientFallBack
.
class
)
@FeignClient
(
value
=
"
spcl-sm-app
"
,
fallback
=
MicroappFeignClientFallBack
.
class
)
public
interface
MicroappFeignClient
{
public
interface
MicroappFeignClient
{
/**
/**
...
@@ -46,7 +47,7 @@ public interface MicroappFeignClient {
...
@@ -46,7 +47,7 @@ public interface MicroappFeignClient {
* @param zxAccountId
* @param zxAccountId
* @return
* @return
*/
*/
@RequestMapping
(
value
=
"/micro_app/haveJurisdictionUserFast"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/micro_app/haveJurisdictionUserFast"
,
method
=
RequestMethod
.
POST
,
consumes
=
MediaType
.
APPLICATION_JSON_VALUE
)
Ret
haveJurisdictionUserFast
(
@RequestBody
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
Ret
haveJurisdictionUserFast
(
@RequestBody
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
);
...
...
src/main/java/org/rcisoft/common/util/feignClient/NotificationFeignClient.java
View file @
5636a627
...
@@ -5,6 +5,7 @@ import org.rcisoft.core.result.NotiRet;
...
@@ -5,6 +5,7 @@ import org.rcisoft.core.result.NotiRet;
import
org.rcisoft.core.result.Ret
;
import
org.rcisoft.core.result.Ret
;
import
org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO
;
import
org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
@@ -15,14 +16,14 @@ import org.springframework.web.bind.annotation.RequestParam;
...
@@ -15,14 +16,14 @@ import org.springframework.web.bind.annotation.RequestParam;
* 智信消息客户端接口
* 智信消息客户端接口
*/
*/
@Component
@Component
@FeignClient
(
value
=
"
ZX-NOTIFICATION
"
,
fallback
=
NotificationFeignClientFallBack
.
class
)
@FeignClient
(
value
=
"
spcl-sm-notice
"
,
fallback
=
NotificationFeignClientFallBack
.
class
)
public
interface
NotificationFeignClient
{
public
interface
NotificationFeignClient
{
/**
/**
* 发送智信消息
* 发送智信消息
* @return
* @return
*/
*/
@RequestMapping
(
value
=
"/notification/send"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/notification/send"
,
method
=
RequestMethod
.
POST
,
consumes
=
MediaType
.
APPLICATION_JSON_VALUE
)
NotiRet
sendMessage
(
@RequestBody
MTNotificationSendReqDTO
mtNotificationSendReqDTO
,
NotiRet
sendMessage
(
@RequestBody
MTNotificationSendReqDTO
mtNotificationSendReqDTO
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxClientType"
)
String
zxClientType
,
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
@RequestParam
(
"zxAccountId"
)
Long
zxAccountId
...
...
src/main/java/org/rcisoft/common/util/outClient/MTCotactApiRequestClient.java
View file @
5636a627
...
@@ -190,16 +190,7 @@ public class MTCotactApiRequestClient {
...
@@ -190,16 +190,7 @@ public class MTCotactApiRequestClient {
* @return
* @return
*/
*/
public
List
<
MTAccountIdRspDTO
>
accountGetUserHead
(
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
)
{
public
List
<
MTAccountIdRspDTO
>
accountGetUserHead
(
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
)
{
if
(
"dev"
.
equalsIgnoreCase
(
serverType
)){
if
(
mtUserGetsReqDTO
.
getUserIds
()
==
null
||
mtUserGetsReqDTO
.
getUserIds
().
size
()
<
1
){
login
();
Map
<
String
,
String
>
headerParams
=
new
HashMap
<>(
2
);
headerParams
.
put
(
"clientType"
,
"app"
);
headerParams
.
put
(
"Authorization"
,
"Bearer "
+
ACCESS_TOKEN
);
String
json
=
okHttpUtil
.
postForJson
(
api
+
"contact/v1/account/get_user_head"
,
JSON
.
toJSONString
(
mtUserGetsReqDTO
),
headerParams
);
if
(
StringUtils
.
isNotEmpty
(
json
))
{
return
JSON
.
parseObject
(
json
,
new
TypeReference
<
Ret
<
List
<
MTAccountIdRspDTO
>>>()
{
}).
getData
();
}
return
new
ArrayList
<>();
return
new
ArrayList
<>();
}
}
return
contactFeignClient
.
accountGetUserHead
(
mtUserGetsReqDTO
,
zxClientType
,
zxAccountId
).
getData
();
return
contactFeignClient
.
accountGetUserHead
(
mtUserGetsReqDTO
,
zxClientType
,
zxAccountId
).
getData
();
...
...
src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java
View file @
5636a627
...
@@ -139,9 +139,9 @@ public class MTNotificationApiRequestClient {
...
@@ -139,9 +139,9 @@ public class MTNotificationApiRequestClient {
List
<
String
>
haveJurisAccountIds
=
new
ArrayList
<>();
List
<
String
>
haveJurisAccountIds
=
new
ArrayList
<>();
List
<
String
>
getUserAccountList
=
new
ArrayList
<>();
List
<
String
>
getUserAccountList
=
new
ArrayList
<>();
List
<
Long
>
getUserAccountLongList
=
(
List
<
Lo
ng
>)
haveJurisList
.
getData
();
List
<
String
>
getUserAccountLongList
=
(
List
<
Stri
ng
>)
haveJurisList
.
getData
();
getUserAccountLongList
.
forEach
(
getUserAccount
->{
getUserAccountLongList
.
forEach
(
getUserAccount
->{
getUserAccountList
.
add
(
String
.
valueOf
(
getUserAccount
)
);
getUserAccountList
.
add
(
getUserAccount
);
});
});
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
=
new
MTUserGetsAccountReqDTO
(
message
.
getCorpId
(),
getUserAccountList
);
MTUserGetsAccountReqDTO
mtUserGetsReqDTO
=
new
MTUserGetsAccountReqDTO
(
message
.
getCorpId
(),
getUserAccountList
);
...
...
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