Browse Source

批量发送通知bug修改

dev
zhaoqifeng 3 years ago
parent
commit
ed6dc1a27e
  1. 10
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java

10
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java

@ -1,6 +1,6 @@
package com.epmet.dto.form; package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.AddGroup;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -23,22 +23,22 @@ public class SendNoticeFormDTO implements Serializable {
/** /**
* 用户列表 * 用户列表
*/ */
@NotEmpty(message = "用户列表不能为空", groups = DefaultGroup.class) @NotEmpty(message = "用户列表不能为空", groups = AddGroup.class)
private List<UserListBean> userList; private List<UserListBean> userList;
/** /**
* 通知渠道通知渠道 0小程序通知1短信通知 * 通知渠道通知渠道 0小程序通知1短信通知
*/ */
@NotEmpty(message = "请选择通知渠道", groups = DefaultGroup.class) @NotEmpty(message = "请选择通知渠道", groups = AddGroup.class)
private List<String> channel; private List<String> channel;
/** /**
* 通知来源 0 行程上报1 疫苗接种2 核酸检测 * 通知来源 0 行程上报1 疫苗接种2 核酸检测
*/ */
@NotEmpty(message = "通知来源不能为空", groups = DefaultGroup.class) @NotEmpty(message = "通知来源不能为空", groups = AddGroup.class)
private String origin; private String origin;
/** /**
* 通知内容 * 通知内容
*/ */
@Size(min = 1, max = 500, message = "通知内容不超过500字") @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = AddGroup.class)
private String content; private String content;
/** /**
* 组织名 * 组织名

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java

@ -72,7 +72,7 @@ public class IcNoticeController {
@PostMapping("sendNotice") @PostMapping("sendNotice")
public Result sendNotice(@LoginUser TokenDto tokenDto, @RequestBody SendNoticeFormDTO formDTO) { public Result sendNotice(@LoginUser TokenDto tokenDto, @RequestBody SendNoticeFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); ValidatorUtils.validateEntity(formDTO, AddGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId()); formDTO.setStaffId(tokenDto.getUserId());
icNoticeService.sendNotice(formDTO); icNoticeService.sendNotice(formDTO);

Loading…
Cancel
Save