|
@@ -1,25 +1,19 @@
|
|
|
package com.ym.mec.web.controller.education;
|
|
|
|
|
|
-import com.ym.mec.common.entity.ImGroupMessage;
|
|
|
-import com.ym.mec.common.entity.ImNoticeMessage;
|
|
|
-import com.ym.mec.common.entity.ImTxtMessage;
|
|
|
+import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
+import com.ym.mec.auth.api.entity.SysUser;
|
|
|
+import com.ym.mec.biz.dal.entity.ImGroupNotice;
|
|
|
+import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
|
|
|
+import com.ym.mec.biz.service.ImGroupNoticeService;
|
|
|
+import com.ym.mec.common.controller.BaseController;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-
|
|
|
-import java.util.Date;
|
|
|
-
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
-import com.ym.mec.auth.api.entity.SysUser;
|
|
|
-import com.ym.mec.biz.dal.entity.ImGroupNotice;
|
|
|
-import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
|
|
|
-import com.ym.mec.biz.service.ImGroupNoticeService;
|
|
|
-import com.ym.mec.common.controller.BaseController;
|
|
|
-import com.ym.mec.im.ImFeignService;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
/**
|
|
|
* @Author Joburgess
|
|
@@ -34,8 +28,6 @@ public class ImGroupNoticeController extends BaseController {
|
|
|
private ImGroupNoticeService imGroupNoticeService;
|
|
|
@Autowired
|
|
|
private SysUserFeignService sysUserFeignService;
|
|
|
- @Autowired
|
|
|
- private ImFeignService imFeignService;
|
|
|
|
|
|
@ApiOperation(value = "新增")
|
|
|
@RequestMapping("/add")
|
|
@@ -46,14 +38,6 @@ public class ImGroupNoticeController extends BaseController {
|
|
|
return failed("获取用户信息失败");
|
|
|
}
|
|
|
imGroupNotice.setOperatorId(sysUser.getId().longValue());
|
|
|
- ImGroupMessage groupMessage = new ImGroupMessage();
|
|
|
- groupMessage.setObjectName("DY:NoticeMsg");
|
|
|
- String[] targetId = new String[]{imGroupNotice.getImGroupId().toString()};
|
|
|
- groupMessage.setTargetId(targetId);
|
|
|
- groupMessage.setSenderId(sysUser.getId().toString());
|
|
|
- groupMessage.setContent(new ImNoticeMessage(imGroupNotice.getContent(),"0"));
|
|
|
- imGroupNoticeService.insert(imGroupNotice);
|
|
|
- imFeignService.groupSend(groupMessage);
|
|
|
return succeed();
|
|
|
}
|
|
|
|