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
3b3692ab
Commit
3b3692ab
authored
Apr 02, 2020
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ret<List<long>>
parent
0238e37f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
edu_modify_table.sql
sql/edu_modify_table.sql
+2
-0
MicroappFeignClientFallBack.java
...oft/common/util/fallback/MicroappFeignClientFallBack.java
+3
-1
MicroappFeignClient.java
.../rcisoft/common/util/feignClient/MicroappFeignClient.java
+3
-1
MTMicroappApiRequestClient.java
...oft/common/util/outClient/MTMicroappApiRequestClient.java
+2
-2
MTNotificationApiRequestClient.java
...common/util/outClient/MTNotificationApiRequestClient.java
+2
-2
No files found.
sql/edu_modify_table.sql
View file @
3b3692ab
...
@@ -45,3 +45,5 @@ update b_lesson set value_consume = '0' where value_consume is null;
...
@@ -45,3 +45,5 @@ update b_lesson set value_consume = '0' where value_consume is null;
-- 改变考试详情表中 字段字符集支持表情 20-1-10 20:20
-- 改变考试详情表中 字段字符集支持表情 20-1-10 20:20
alter
table
tm_examdata
modify
column
`e_data`
longtext
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
;
alter
table
tm_examdata
modify
column
`e_data`
longtext
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
;
------以上--预上线环境 已全部更新 2020/04/01 (正式环境未执行)
src/main/java/org/rcisoft/common/util/fallback/MicroappFeignClientFallBack.java
View file @
3b3692ab
...
@@ -5,6 +5,8 @@ import org.rcisoft.common.util.feignClient.MicroappFeignClient;
...
@@ -5,6 +5,8 @@ import org.rcisoft.common.util.feignClient.MicroappFeignClient;
import
org.rcisoft.common.util.feignDto.HaveJurisdictionReqDTO
;
import
org.rcisoft.common.util.feignDto.HaveJurisdictionReqDTO
;
import
org.rcisoft.core.result.Ret
;
import
org.rcisoft.core.result.Ret
;
import
java.util.List
;
@Slf4j
@Slf4j
public
class
MicroappFeignClientFallBack
implements
MicroappFeignClient
{
public
class
MicroappFeignClientFallBack
implements
MicroappFeignClient
{
@Override
@Override
...
@@ -24,7 +26,7 @@ public class MicroappFeignClientFallBack implements MicroappFeignClient {
...
@@ -24,7 +26,7 @@ public class MicroappFeignClientFallBack implements MicroappFeignClient {
}
}
@Override
@Override
public
Ret
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
String
zxClientType
,
Long
zxAccountId
)
{
public
Ret
<
List
<
Long
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
String
zxClientType
,
Long
zxAccountId
)
{
log
.
error
(
"---------------调智信接口 /micro_app/haveJurisdictionUserFast(筛选有通知权限的人-优化) 失败-------------------"
);
log
.
error
(
"---------------调智信接口 /micro_app/haveJurisdictionUserFast(筛选有通知权限的人-优化) 失败-------------------"
);
...
...
src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java
View file @
3b3692ab
...
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.List
;
/**
/**
* 智信消息客户端接口
* 智信消息客户端接口
*/
*/
...
@@ -47,7 +49,7 @@ public interface MicroappFeignClient {
...
@@ -47,7 +49,7 @@ public interface MicroappFeignClient {
* @return
* @return
*/
*/
@RequestMapping
(
value
=
"/micro_app/haveJurisdictionUserFast"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/micro_app/haveJurisdictionUserFast"
,
method
=
RequestMethod
.
POST
)
Ret
haveJurisdictionUserFast
(
@RequestBody
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
,
Ret
<
List
<
Long
>>
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/outClient/MTMicroappApiRequestClient.java
View file @
3b3692ab
...
@@ -46,9 +46,9 @@ public class MTMicroappApiRequestClient {
...
@@ -46,9 +46,9 @@ public class MTMicroappApiRequestClient {
return
ret
;
return
ret
;
}
}
public
Ret
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
)
{
public
Ret
<
List
<
Long
>>
haveJurisdictionUserFast
(
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
)
{
haveJurisdictionReqDTO
.
setAppId
(
appId
);
haveJurisdictionReqDTO
.
setAppId
(
appId
);
Ret
ret
=
microappFeignClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
,
zxClientType
,
zxAccountId
);
Ret
<
List
<
Long
>>
ret
=
microappFeignClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
,
zxClientType
,
zxAccountId
);
return
ret
;
return
ret
;
}
}
...
...
src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java
View file @
3b3692ab
...
@@ -132,14 +132,14 @@ public class MTNotificationApiRequestClient {
...
@@ -132,14 +132,14 @@ public class MTNotificationApiRequestClient {
});
});
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
=
new
HaveJurisdictionReqDTO
(
Long
.
parseLong
(
message
.
getCorpId
()),
recipientIdLongList
);
HaveJurisdictionReqDTO
haveJurisdictionReqDTO
=
new
HaveJurisdictionReqDTO
(
Long
.
parseLong
(
message
.
getCorpId
()),
recipientIdLongList
);
log
.
debug
(
"----------------------通知-权限验证---------------------"
);
log
.
debug
(
"----------------------通知-权限验证---------------------"
);
Ret
haveJurisList
=
microappApiRequestClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
);
Ret
<
List
<
Long
>>
haveJurisList
=
microappApiRequestClient
.
haveJurisdictionUserFast
(
haveJurisdictionReqDTO
);
log
.
debug
(
"----------------------通知-权限验证返回结果----------------------"
+
haveJurisList
.
getData
());
log
.
debug
(
"----------------------通知-权限验证返回结果----------------------"
+
haveJurisList
.
getData
());
if
(
haveJurisList
.
getData
()
==
null
){
if
(
haveJurisList
.
getData
()
==
null
){
return
false
;
return
false
;
}
}
List
<
String
>
haveJurisAccountIds
=
new
ArrayList
<>();
List
<
String
>
haveJurisAccountIds
=
new
ArrayList
<>();
// List<String> getUserAccountList = new ArrayList<>();
// List<String> getUserAccountList = new ArrayList<>();
List
<
Long
>
getUserAccountLongList
=
(
List
<
Long
>)
haveJurisList
.
getData
();
List
<
Long
>
getUserAccountLongList
=
haveJurisList
.
getData
();
// getUserAccountLongList.forEach(getUserAccount ->{
// getUserAccountLongList.forEach(getUserAccount ->{
// getUserAccountList.add(String.valueOf(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