消息通知功能完善
This commit is contained in:
@@ -1,7 +1,18 @@
|
||||
package com.zscat.mallplus.ums.controller;
|
||||
|
||||
|
||||
import com.zscat.mallplus.annotation.SysLog;
|
||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||
import com.zscat.mallplus.ums.service.ISysMessageService;
|
||||
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||
import com.zscat.mallplus.utils.CommonResult;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -19,8 +30,49 @@ import javax.annotation.Resource;
|
||||
@RequestMapping("/ums/sysMessage")
|
||||
public class SysMessageController {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(SysMessageController.class);
|
||||
|
||||
@Resource
|
||||
private ISysMessageService messageService;
|
||||
|
||||
@PostMapping(value = "/sendToOne")
|
||||
public Object sendToOne(@RequestBody SysMessage entity) {
|
||||
try {
|
||||
if (messageService.sendToOne(entity)) {
|
||||
return new CommonResult().success();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("向指定会员 {} 发信息失败:{}", entity.getUserId(), e.getMessage());
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
|
||||
@PostMapping(value = "/sendToAll")
|
||||
public Object sendToAll(@RequestBody SysMessage entity) {
|
||||
try {
|
||||
if (messageService.sendToAll(entity)) {
|
||||
return new CommonResult().success();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("向所有会员发信息失败:{}", e.getMessage());
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
|
||||
@PostMapping(value = "/sendToSelect")
|
||||
public Object sendToSelect(@RequestBody SysMessageSendSelectVo vo) {
|
||||
try {
|
||||
if (messageService.sendToSelect(vo)) {
|
||||
return new CommonResult().success();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("向所选会员发信息失败:{}", e.getMessage());
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
return new CommonResult().failed();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -174,7 +174,7 @@ public class UmsMemberController {
|
||||
@SysLog(MODULE = "ums", REMARK = "删除会员表")
|
||||
@ApiOperation("删除会员表")
|
||||
@GetMapping(value = "/delete/{id}")
|
||||
@PreAuthorize("hasAuthority('ums:UmsMember:delete')")
|
||||
// @PreAuthorize("hasAuthority('ums:UmsMember:delete')")
|
||||
public Object deleteUmsMember(@ApiParam("会员表id") @PathVariable Long id) {
|
||||
try {
|
||||
if (ValidatorUtils.empty(id)) {
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.zscat.mallplus.ums.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -13,4 +14,11 @@ import com.zscat.mallplus.ums.entity.SysMessage;
|
||||
*/
|
||||
public interface ISysMessageService extends IService<SysMessage> {
|
||||
|
||||
boolean sendToOne(SysMessage entity);
|
||||
|
||||
boolean sendToAll(SysMessage entity);
|
||||
|
||||
boolean sendToSelect(SysMessageSendSelectVo vo);
|
||||
|
||||
boolean sendOrderDeliver(String orderNo,Integer userId);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@@ -19,4 +20,6 @@ public interface IUmsMemberService extends IService<UmsMember> {
|
||||
void updataMemberOrderInfo();
|
||||
|
||||
Map memberMonthStatic( String date);
|
||||
|
||||
List<UmsMember> listAll();
|
||||
}
|
||||
|
||||
@@ -2,10 +2,17 @@ package com.zscat.mallplus.ums.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||
import com.zscat.mallplus.ums.mapper.SysMessageMapper;
|
||||
import com.zscat.mallplus.ums.service.ISysMessageService;
|
||||
import com.zscat.mallplus.ums.service.IUmsMemberService;
|
||||
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 站内信 服务实现类
|
||||
@@ -17,4 +24,51 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
|
||||
|
||||
@Autowired
|
||||
private IUmsMemberService memberService;
|
||||
|
||||
@Override
|
||||
public boolean sendToOne(SysMessage entity) {
|
||||
entity.setId(null);
|
||||
return this.save(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sendToAll(SysMessage entity) {
|
||||
List<UmsMember> memberList = memberService.listAll();
|
||||
// List<SysMessage> messList = new ArrayList<>();
|
||||
for (UmsMember member : memberList) {
|
||||
// SysMessage
|
||||
entity.setId(null);
|
||||
Integer id = Math.toIntExact(member.getId());
|
||||
entity.setUserId(id);
|
||||
// messList.add(en)
|
||||
this.save(entity);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sendToSelect(SysMessageSendSelectVo vo) {
|
||||
SysMessage entity = vo.getSysMessage();
|
||||
List<Integer> userIdList = vo.getUserIdList();
|
||||
for (Integer memberId : userIdList) {
|
||||
entity.setId(null);
|
||||
entity.setUserId(memberId);
|
||||
this.save(entity);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sendOrderDeliver(String orderNo, Integer userId) {
|
||||
SysMessage entity = new SysMessage();
|
||||
entity.setId(null);
|
||||
entity.setCode("交易物流");
|
||||
entity.setParams("货物已发出");
|
||||
entity.setContent("你的订单号码为:"+orderNo+" 的货物已经发出,请您留意物流信息!");
|
||||
entity.setUserId(userId);
|
||||
this.save(entity);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,4 +58,9 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
|
||||
public Map memberMonthStatic(@Param("date") String date){
|
||||
return memberMapper.memberMonthStatic(date);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UmsMember> listAll() {
|
||||
return baseMapper.selectList(new QueryWrapper<UmsMember>());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.zscat.mallplus.ums.vo;
|
||||
|
||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SysMessageSendSelectVo {
|
||||
|
||||
private List<Integer> userIdList = new ArrayList<>();
|
||||
|
||||
private SysMessage sysMessage;
|
||||
|
||||
public List<Integer> getUserIdList() {
|
||||
return userIdList;
|
||||
}
|
||||
|
||||
public void setUserIdList(List<Integer> userIdList) {
|
||||
this.userIdList = userIdList;
|
||||
}
|
||||
|
||||
public SysMessage getSysMessage() {
|
||||
return sysMessage;
|
||||
}
|
||||
|
||||
public void setSysMessage(SysMessage sysMessage) {
|
||||
this.sysMessage = sysMessage;
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ spring.redis.host=127.0.0.1
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
||||
spring.redis.port=6379
|
||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
||||
spring.redis.password=123456
|
||||
spring.redis.password=
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
spring.redis.pool.max-active=8
|
||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||
|
||||
Reference in New Issue
Block a user