短信发送
This commit is contained in:
@@ -48,7 +48,7 @@ public class MsgApi {
|
||||
|
||||
/**
|
||||
* @param channels 推送渠道 (INNER:站内消息; SMS:短信; Mail:邮件; WeChat:微信; DingTalk:钉钉;同时推送多个渠道用英文逗号分隔 )
|
||||
* @param loginNames 字符串,多个工号用英文逗号分隔 ","
|
||||
* @param loginNameStr 字符串,多个工号用英文逗号分隔 ","
|
||||
* @param mtype 消息类型; 0: 图文 1: 文字 2: 外链
|
||||
* @param title 标题
|
||||
* @param content 内容
|
||||
@@ -56,7 +56,7 @@ public class MsgApi {
|
||||
* @author zhf
|
||||
* @description
|
||||
*/
|
||||
public void sendMsg(List<String> channels, String loginNames, Integer mtype, String title, String content, String imageUrl,String link) {
|
||||
public void sendMsg(List<String> channels, String loginNameStr, Integer mtype, String title, String content, String imageUrl,String link) {
|
||||
try {
|
||||
if (!Globals.MyConfig.getBoolean("SendMsg")) {
|
||||
log.info("发送失败,消息暂未开启!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||
@@ -68,7 +68,7 @@ public class MsgApi {
|
||||
return;
|
||||
}
|
||||
|
||||
if (StrUtil.isBlank(title)||StrUtil.isBlank(content) ||Lang.isEmpty(channels) || Lang.isEmpty(loginNames)) {
|
||||
if (StrUtil.isBlank(title)||StrUtil.isBlank(content) ||Lang.isEmpty(channels) || Lang.isEmpty(loginNameStr)) {
|
||||
log.info("发送失败,缺少需要参数请检查!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||
return;
|
||||
}
|
||||
@@ -78,7 +78,7 @@ public class MsgApi {
|
||||
map.put("channel", String.join(",", channels));
|
||||
//推送范围(1:普通模式;2:全体教师;3:全体学生;4:全体人员)
|
||||
map.put("objScope", 1);
|
||||
map.put("objIds", loginNames);
|
||||
map.put("objIds", loginNameStr);
|
||||
map.put("mtype", mtype);
|
||||
map.put("sendStatus", 1);
|
||||
map.put("title", title);
|
||||
|
||||
+3
-3
@@ -214,9 +214,9 @@ public class ClubMyApplyController {
|
||||
Map<String, Sys_user> userMap = sysUsers.stream().collect(Collectors.toMap(Sys_user::getLoginname, o -> o));
|
||||
for (String user : userList) {
|
||||
Sys_user sysUser = userMap.get(user);
|
||||
String content = "%s老师您好,欢迎加入%s,请进入入会申请进行确认!".formatted(sysUser.getUsername(), sysClub.getName())
|
||||
+ Globals.AppDomain + "/platform/sys/club/sq/mobile";
|
||||
msgApi.sendMsg(List.of("DingTalk"), user, 1, "协会入会邀请", content, "", "");
|
||||
String content = "%s老师您好,欢迎加入%s,请进入入会申请进行确认!".formatted(sysUser.getUsername(), sysClub.getName());
|
||||
String link = Globals.AppDomain + "/platform/sys/club/sq/mobile";
|
||||
msgApi.sendMsg(List.of("DingTalk"), user, 2, "协会入会邀请", content, "", link);
|
||||
|
||||
dao.update(
|
||||
Sys_club_user.class,
|
||||
|
||||
@@ -145,6 +145,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
|
||||
if (Strings.isNotBlank(user.getUnit().getUnionid())) {
|
||||
Sys_union union = dao().fetch(Sys_union.class, user.getUnit().getUnionid());
|
||||
user.setUnion(union);
|
||||
} else {
|
||||
User fetch = dao().fetch(User.class, Cnd.where("id", "=", user.getId()));
|
||||
if (StrUtil.isNotBlank(fetch.getUnionid())) {
|
||||
Sys_union union = dao().fetch(Sys_union.class, fetch.getUnionid());
|
||||
user.setUnion(union);
|
||||
}
|
||||
}
|
||||
}
|
||||
return user;
|
||||
|
||||
@@ -321,8 +321,8 @@ public class WelfareProjectMangeController {
|
||||
|
||||
WelfareProject project = dao.fetch(WelfareProject.class, projectId);
|
||||
String link = Globals.AppDomain + "/mobile/welfare/list/receive?projectId=%s".formatted(projectId);
|
||||
String imageUrl = Globals.AppDomain + "/file_server/fileStreamPreview?id=" + project.getCover();
|
||||
msgApi.sendMsg(List.of("DingTalk"), loginNames, 0, "职工福利", sendMsgValue, imageUrl, link);
|
||||
// String imageUrl = Globals.AppDomain + "/file_server/fileStreamPreview?id=" + project.getCover();
|
||||
msgApi.sendMsg(List.of("DingTalk"), loginNames, 2, "职工福利", sendMsgValue, "", link);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user