|
@@ -38,7 +38,7 @@ public class SysMessageController extends BaseController {
|
|
|
|
|
|
@ApiOperation("获取所有消息列表")
|
|
|
@GetMapping(value = "list")
|
|
|
- public Object list(SysMessageQueryInfo queryInfo) throws IOException {
|
|
|
+ public Object list(SysMessageQueryInfo queryInfo){
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
@@ -51,17 +51,6 @@ public class SysMessageController extends BaseController {
|
|
|
return succeed(pageInfo);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("一键已读")
|
|
|
- @PostMapping("batchSetRead")
|
|
|
- public Object batchSetRead() {
|
|
|
- int status = 1;
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if (sysUser == null) {
|
|
|
- return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
- }
|
|
|
- return sysMessageService.updateStatus(sysUser.getId(), status) > 0 ? succeed() : failed();
|
|
|
- }
|
|
|
-
|
|
|
@ApiOperation("设置已读")
|
|
|
@PostMapping("setRead")
|
|
|
public Object setRead(Long id) {
|
|
@@ -80,66 +69,6 @@ public class SysMessageController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
}
|
|
|
- return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId()));
|
|
|
- }
|
|
|
-
|
|
|
- /*@ApiOperation(value = "发送短信验证码")
|
|
|
- @PostMapping("/sendSmsCode")
|
|
|
- public Object sendSmsCode(String sendCodeType, String mobileNo) {
|
|
|
-
|
|
|
- SysUser sysUser;
|
|
|
-
|
|
|
- if (StringUtils.isBlank(mobileNo)) {
|
|
|
- sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- } else {
|
|
|
- sysUser = sysUserFeignService.queryUserByMobile(mobileNo);
|
|
|
- }
|
|
|
- if (sysUser == null) {
|
|
|
- return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
- }
|
|
|
- Integer userId = sysUser.getId();
|
|
|
-
|
|
|
- mobileNo = sysUser.getPhone();
|
|
|
-
|
|
|
- MessageType messageType = MessageType.getMessageType(sendCodeType);
|
|
|
- if (messageType == null) {
|
|
|
- throw new BizException("消息类型参数错误");
|
|
|
- }
|
|
|
- if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
|
|
|
- throw new BizException("请输入正确的手机号");
|
|
|
- }
|
|
|
- sysMessageService.sendSecurityCode(MessageSender.YIMEI, userId, MessageSendMode.SMS, messageType, mobileNo);
|
|
|
- return succeed();
|
|
|
- }*/
|
|
|
-
|
|
|
- /*@ApiOperation(value = "发送短信验证码")
|
|
|
- @PostMapping("/noAuth/sendSmsCode")
|
|
|
- public Object noAuthSendSmsCode(String sendCodeType, String mobileNo) {
|
|
|
- MessageType messageType = MessageType.getMessageType(sendCodeType);
|
|
|
- if (messageType == null) {
|
|
|
- throw new BizException("消息类型参数错误");
|
|
|
- }
|
|
|
- if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
|
|
|
- throw new BizException("请输入正确的手机号");
|
|
|
- }
|
|
|
-// sysMessageService.sendSecurityCode(MessageSender.YIMEI, userId, MessageSendMode.SMS, messageType, mobileNo);
|
|
|
- return succeed();
|
|
|
- }*/
|
|
|
-
|
|
|
- @ApiOperation(value = "发送消息")
|
|
|
- @PostMapping("/sendMessage")
|
|
|
- public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url, String group) {
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if (sysUser == null) {
|
|
|
- return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
- }
|
|
|
- Integer userId = sysUser.getId();
|
|
|
-
|
|
|
- String mobileNo = sysUser.getPhone();
|
|
|
- if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
|
|
|
- throw new BizException("请输入正确的手机号");
|
|
|
- }
|
|
|
- sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group,null);
|
|
|
- return succeed();
|
|
|
+ return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null));
|
|
|
}
|
|
|
}
|