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
ad289242
Commit
ad289242
authored
Dec 06, 2019
by
zhangqingle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改通知路径
parent
e7ee52c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
BLessonController.java
...cisoft/business/blesson/controller/BLessonController.java
+2
-7
MTNotificationApiRequestClient.java
...common/util/outClient/MTNotificationApiRequestClient.java
+2
-2
No files found.
src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
View file @
ad289242
...
...
@@ -463,7 +463,6 @@ public class BLessonController extends PaginationController<BLesson> {
List
<
String
>
deptList
=
asList
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
split
(
appointLessonDTO
.
getAppointDepart
(),
","
));
Set
<
String
>
deptSet
=
new
HashSet
<>(
deptList
);
List
<
String
>
inDepartPerson
=
cotactApiRequestClient
.
getSubUserIdsByDeptIds
(
appointLessonDTO
.
getCorpId
(),
deptSet
);
//指派课程
AppointResDTO
data
=
bLessonService
.
appointLessonToPerson
(
appointLessonDTO
,
inDepartPerson
);
...
...
@@ -472,14 +471,10 @@ public class BLessonController extends PaginationController<BLesson> {
//发送通知
// new Thread(){
// public void run(){
sendNoticeService
.
sendAppointNotice
(
data
.
getBLesson
(),
data
.
getAppointLessonDTO
(),
data
.
getNoticePersonList
());
//
sendNoticeService
.
sendAppointNotice
(
data
.
getBLesson
(),
data
.
getAppointLessonDTO
(),
data
.
getNoticePersonList
());
// }
// }.start();
return
Result
.
builder
(
new
PersistModel
(
data
.
getResLine
()),
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
...
...
@@ -769,7 +764,7 @@ public class BLessonController extends PaginationController<BLesson> {
*/
@ApiOperation
(
value
=
"643 判断是正在学该课程"
,
notes
=
"判断是正在学该课程"
)
@GetMapping
(
value
=
"/learning"
)
//0 已在学习
或自己的课 1 不是自己的课
第一次点击
//0 已在学习
1
第一次点击
public
Result
learning
(
CurUser
curUser
,
@Valid
LessonAndUserDTO
lessonAndUserDTO
,
BindingResult
bindingResult
)
{
int
result
=
bLessonPersonService
.
selectByPersonAndLesson
(
lessonAndUserDTO
);
return
Result
.
builder
(
new
PersistModel
(
1
),
...
...
src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java
View file @
ad289242
...
...
@@ -86,7 +86,7 @@ public class MTNotificationApiRequestClient {
* @return
*/
public
boolean
send
(
BNotice
message
,
String
noticeTitle
,
String
type
,
String
urlType
)
{
if
(
"dev"
.
equalsIgnoreCase
(
serverType
)
||
"mt"
.
equalsIgnoreCase
(
serverType
)
)
{
if
(
true
)
{
return
true
;
}
NotiRet
ret
=
new
NotiRet
();
...
...
@@ -180,7 +180,7 @@ public class MTNotificationApiRequestClient {
put
(
"url"
,
url
);
put
(
"createUrl"
,
senderUser
.
getHeadPic
());
put
(
"createName"
,
senderUser
.
getName
());
//
put("area",finalNoticeType);
put
(
"area"
,
finalNoticeType
);
}});
String
json
=
JSON
.
toJSONString
(
mtNotificationSendReqDTO
);
...
...
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