消息修改

This commit is contained in:
梁琦涛
2021-09-23 14:02:29 +08:00
parent ba329fcf20
commit c744a5a06d
4 changed files with 24 additions and 8 deletions
@@ -55,7 +55,7 @@ public class PayAnnouncementMessageController extends JeroController<PayAnnounce
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
payAnnouncementMessage.setRecipient(sysUser.getUsername());
payAnnouncementMessage.setRecipient(sysUser.getId());
QueryWrapper<PayAnnouncementMessage> queryWrapper = QueryGenerator.initQueryWrapper(payAnnouncementMessage, req.getParameterMap());
Page<PayAnnouncementMessage> page = new Page<>(pageNo, pageSize);
IPage<PayAnnouncementMessage> pageList = payAnnouncementMessageService.page(page, queryWrapper);
@@ -69,8 +69,8 @@ public class PayAnnouncementMessageController extends JeroController<PayAnnounce
* @Return
* @Exception
*/
@AutoLog(value = "消息-添加")
@ApiOperation(value="消息-添加", notes="消息-添加")
@AutoLog(value = "消息-已读")
@ApiOperation(value="消息-已读", notes="消息-已读")
@PostMapping(value = "/add")
public Result<?> update(@RequestBody PayAnnouncementMessage payAnnouncementMessage) {
LambdaUpdateWrapper<PayAnnouncementMessage> update = new LambdaUpdateWrapper<>();
@@ -111,13 +111,13 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
}
/**
* 校验登陆人是否可以操作工作组
* 校验登录人是否可以操作工作组
*
* @param id 工作组id
* @return
*/
@AutoLog(value = "工作组项目-校验登陆人是否可以操作工作组")
@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-校验登陆人是否可以操作工作组")
@AutoLog(value = "工作组项目-校验登录人是否可以操作工作组")
@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-校验登录人是否可以操作工作组")
@GetMapping(value = "/checkoutOperation")
public Result<?> checkoutOperation(@RequestParam("id") String id) {
if(StringUtils.isBlank(id)){
@@ -4,6 +4,8 @@ import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.dto.message.MessageDTO;
import com.jero.common.api.dto.message.TemplateMessageDTO;
import com.jero.common.api.vo.Result;
import com.jero.message.entity.PayAnnouncementMessage;
import com.jero.common.enums.MessageEnums;
@@ -170,6 +172,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
payAnnouncementMessage.setOperation(MessageEnums.MSG14.getDetail());
payAnnouncementMessage.setBusId(p.getId());
payAnnouncementMessageService.sendMessage(payAnnouncementMessage);
TemplateMessageDTO templateMessageDTO = new TemplateMessageDTO();
templateMessageDTO.setTitle(MessageEnums.MSG14.getValue());
templateMessageDTO.setFromUser(sysUser.getId());
templateMessageDTO.setToUser(sysUser.getUsername());
templateMessageDTO.setTemplateCode("sys_ts_note");
sysBaseAPI.sendTemplateAnnouncement(templateMessageDTO);
});
// todo 缺少发送消息
return Result.OK("添加成功!");