Commit ad289242 authored by zhangqingle's avatar zhangqingle

修改通知路径

parent e7ee52c2
...@@ -463,7 +463,6 @@ public class BLessonController extends PaginationController<BLesson> { ...@@ -463,7 +463,6 @@ public class BLessonController extends PaginationController<BLesson> {
List<String> deptList = asList(org.apache.commons.lang.StringUtils.split(appointLessonDTO.getAppointDepart(), ",")); List<String> deptList = asList(org.apache.commons.lang.StringUtils.split(appointLessonDTO.getAppointDepart(), ","));
Set<String> deptSet = new HashSet<>(deptList); Set<String> deptSet = new HashSet<>(deptList);
List<String> inDepartPerson = cotactApiRequestClient.getSubUserIdsByDeptIds(appointLessonDTO.getCorpId(),deptSet); List<String> inDepartPerson = cotactApiRequestClient.getSubUserIdsByDeptIds(appointLessonDTO.getCorpId(),deptSet);
//指派课程 //指派课程
AppointResDTO data = bLessonService.appointLessonToPerson(appointLessonDTO , inDepartPerson); AppointResDTO data = bLessonService.appointLessonToPerson(appointLessonDTO , inDepartPerson);
...@@ -472,14 +471,10 @@ public class BLessonController extends PaginationController<BLesson> { ...@@ -472,14 +471,10 @@ public class BLessonController extends PaginationController<BLesson> {
//发送通知 //发送通知
// new Thread(){ // new Thread(){
// public void run(){ // public void run(){
sendNoticeService.sendAppointNotice(data.getBLesson(),data.getAppointLessonDTO(),data.getNoticePersonList());
sendNoticeService.sendAppointNotice(data.getBLesson(),data.getAppointLessonDTO(),data.getNoticePersonList());
//
// } // }
// }.start(); // }.start();
return Result.builder(new PersistModel(data.getResLine()), return Result.builder(new PersistModel(data.getResLine()),
MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR, MessageConstant.MESSAGE_ALERT_ERROR,
...@@ -769,7 +764,7 @@ public class BLessonController extends PaginationController<BLesson> { ...@@ -769,7 +764,7 @@ public class BLessonController extends PaginationController<BLesson> {
*/ */
@ApiOperation(value = "643 判断是正在学该课程", notes = "判断是正在学该课程") @ApiOperation(value = "643 判断是正在学该课程", notes = "判断是正在学该课程")
@GetMapping(value = "/learning") @GetMapping(value = "/learning")
//0 已在学习或自己的课 1 不是自己的课第一次点击 //0 已在学习 1 第一次点击
public Result learning(CurUser curUser, @Valid LessonAndUserDTO lessonAndUserDTO, BindingResult bindingResult) { public Result learning(CurUser curUser, @Valid LessonAndUserDTO lessonAndUserDTO, BindingResult bindingResult) {
int result = bLessonPersonService.selectByPersonAndLesson(lessonAndUserDTO); int result = bLessonPersonService.selectByPersonAndLesson(lessonAndUserDTO);
return Result.builder(new PersistModel(1), return Result.builder(new PersistModel(1),
......
...@@ -86,7 +86,7 @@ public class MTNotificationApiRequestClient { ...@@ -86,7 +86,7 @@ public class MTNotificationApiRequestClient {
* @return * @return
*/ */
public boolean send(BNotice message, String noticeTitle, String type, String urlType) { public boolean send(BNotice message, String noticeTitle, String type, String urlType) {
if("dev".equalsIgnoreCase(serverType) || "mt".equalsIgnoreCase(serverType)) { if(true) {
return true; return true;
} }
NotiRet ret = new NotiRet(); NotiRet ret = new NotiRet();
...@@ -180,7 +180,7 @@ public class MTNotificationApiRequestClient { ...@@ -180,7 +180,7 @@ public class MTNotificationApiRequestClient {
put("url", url); put("url", url);
put("createUrl",senderUser.getHeadPic()); put("createUrl",senderUser.getHeadPic());
put("createName",senderUser.getName()); put("createName",senderUser.getName());
// put("area",finalNoticeType); put("area",finalNoticeType);
}}); }});
String json = JSON.toJSONString(mtNotificationSendReqDTO); String json = JSON.toJSONString(mtNotificationSendReqDTO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment