27 changed files with 200 additions and 735 deletions
@ -1,69 +0,0 @@ |
|||||||
package com.hnac.hzims.message.entity; |
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField; |
|
||||||
import com.baomidou.mybatisplus.annotation.TableField; |
|
||||||
import com.baomidou.mybatisplus.annotation.TableName; |
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat; |
|
||||||
import com.hnac.hzims.message.entity.config.MessageTemplateEntity; |
|
||||||
import io.swagger.annotations.ApiModel; |
|
||||||
import io.swagger.annotations.ApiModelProperty; |
|
||||||
import lombok.Data; |
|
||||||
import lombok.EqualsAndHashCode; |
|
||||||
import org.springblade.core.mp.support.QueryField; |
|
||||||
import org.springblade.core.mp.support.SqlCondition; |
|
||||||
import org.springblade.core.tool.utils.DateUtil; |
|
||||||
import org.springframework.format.annotation.DateTimeFormat; |
|
||||||
|
|
||||||
import java.time.LocalDateTime; |
|
||||||
|
|
||||||
@Data |
|
||||||
@ApiModel(value = "消息推送记录",description = "消息推送记录") |
|
||||||
@TableName("hzims_message_push_record") |
|
||||||
@EqualsAndHashCode |
|
||||||
public class MessagePushRecordEntity extends MessageTemplateEntity { |
|
||||||
|
|
||||||
@ApiModelProperty("业务任务ID") |
|
||||||
@QueryField(condition = SqlCondition.EQUAL) |
|
||||||
private Long taskId; |
|
||||||
|
|
||||||
@ApiModelProperty("消息模板ID") |
|
||||||
@QueryField(condition = SqlCondition.EQUAL) |
|
||||||
private Long templateId; |
|
||||||
|
|
||||||
@ApiModelProperty("资源编码") |
|
||||||
@QueryField(condition = SqlCondition.EQUAL) |
|
||||||
private String resourceCode; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送人") |
|
||||||
@QueryField(condition = SqlCondition.LIKE) |
|
||||||
private String pusher; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送账号：手机号，邮箱") |
|
||||||
private String account; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "推送人名称") |
|
||||||
@QueryField(condition = SqlCondition.LIKE) |
|
||||||
private String pusherName; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "内容") |
|
||||||
private String content; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "计划推送时间") |
|
||||||
@JsonFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
private LocalDateTime planTime; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "实际推送时间") |
|
||||||
@JsonFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
private LocalDateTime pushTime; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "响应时间") |
|
||||||
@JsonFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) |
|
||||||
private LocalDateTime respondTime; |
|
||||||
|
|
||||||
@ApiModelProperty(value = "响应说明") |
|
||||||
private String respondRemark; |
|
||||||
|
|
||||||
} |
|
||||||
@ -0,0 +1,51 @@ |
|||||||
|
package com.hnac.hzims.message.entity.config; |
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import org.springblade.core.mp.support.QueryField; |
||||||
|
import org.springblade.core.mp.support.SqlCondition; |
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull; |
||||||
|
|
||||||
|
/** |
||||||
|
* @ClassName MessageTemplateEntity |
||||||
|
* @description: |
||||||
|
* @author: hx |
||||||
|
* @create: 2023-04-06 14:55 |
||||||
|
* @Version 4.0 |
||||||
|
**/ |
||||||
|
public class MessageTemplateEntity { |
||||||
|
|
||||||
|
@ApiModelProperty(value = "消息类型") |
||||||
|
@NotNull(message = "消息类型不能为空") |
||||||
|
@QueryField(condition = SqlCondition.EQUAL) |
||||||
|
private String type; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "业务分类。系统通知：system,事务消息：business,日常提醒：dailyRemind,巡检消息：inspect",required = true) |
||||||
|
@NotNull(message = "业务分类不能为空") |
||||||
|
@QueryField(condition = SqlCondition.EQUAL) |
||||||
|
private String businessClassify; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "业务关键字",required = true) |
||||||
|
@NotNull(message = "业务关键字不能为空") |
||||||
|
@QueryField(condition = SqlCondition.LIKE) |
||||||
|
private String businessKey; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "主题",required = true) |
||||||
|
@NotNull(message = "主题不能为空") |
||||||
|
@QueryField(condition = SqlCondition.LIKE) |
||||||
|
private String subject; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "集中推送时长") |
||||||
|
private Integer concentratedDuration; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "集中推送单位") |
||||||
|
private String concentratedTimeUnit; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "提前推送时长") |
||||||
|
private Integer advanceDuration; |
||||||
|
|
||||||
|
@ApiModelProperty(value = "提前推送单位") |
||||||
|
@QueryField(condition = SqlCondition.EQUAL) |
||||||
|
private String advanceTimeUnit; |
||||||
|
|
||||||
|
} |
||||||
@ -1,34 +0,0 @@ |
|||||||
package com.hnac.hzims.message.config; |
|
||||||
|
|
||||||
import com.hnac.hzims.message.MessageConstants; |
|
||||||
import com.hnac.hzims.message.service.IMessageService; |
|
||||||
import org.springblade.core.tool.utils.SpringUtil; |
|
||||||
|
|
||||||
|
|
||||||
public class MessageFactory { |
|
||||||
|
|
||||||
/** @Author hx |
|
||||||
* @Description 获取方法类型 |
|
||||||
* @Date 2023/4/4 14:22 |
|
||||||
* @Param [messageType] 消息类型 |
|
||||||
* @return com.hnac.hzims.message.service.IMessageService |
|
||||||
**/ |
|
||||||
public static IMessageService getMessageSend(String messageType) { |
|
||||||
if(MessageConstants.APP_PUSH.equals(messageType)) { |
|
||||||
return SpringUtil.getBean("pushMessageService"); |
|
||||||
} |
|
||||||
else if(MessageConstants.SMS_PUSH.equals(messageType)) { |
|
||||||
return SpringUtil.getBean("smsMessageService"); |
|
||||||
} |
|
||||||
else if(MessageConstants.MAIL_PUSH.equals(messageType)) { |
|
||||||
return SpringUtil.getBean("mailMessageService"); |
|
||||||
} |
|
||||||
else if(MessageConstants.WS_PUSH.equals(messageType)) { |
|
||||||
return SpringUtil.getBean("websocketService"); |
|
||||||
} |
|
||||||
else { |
|
||||||
return null; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
} |
|
||||||
@ -1,60 +0,0 @@ |
|||||||
package com.hnac.hzims.message.controller; |
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
||||||
import com.hnac.hzims.message.entity.MessagePushRecordEntity; |
|
||||||
import com.hnac.hzims.message.service.IMessagePushRecordService; |
|
||||||
import io.swagger.annotations.Api; |
|
||||||
import io.swagger.annotations.ApiOperation; |
|
||||||
import io.swagger.annotations.ApiParam; |
|
||||||
import lombok.AllArgsConstructor; |
|
||||||
import org.springblade.core.boot.ctrl.BladeController; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
import org.springblade.core.tool.api.R; |
|
||||||
import org.springframework.web.bind.annotation.*; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
@RestController |
|
||||||
@RequestMapping("/message/record") |
|
||||||
@Api(value = "消息推送记录",tags = "消息推送记录") |
|
||||||
@AllArgsConstructor |
|
||||||
public class MessagePushRecordController extends BladeController { |
|
||||||
|
|
||||||
private final IMessagePushRecordService messagePushRecordService; |
|
||||||
|
|
||||||
@PostMapping("/save") |
|
||||||
@ApiOperation("保存消息推送") |
|
||||||
@ApiOperationSupport(order = 1) |
|
||||||
public R<Boolean> save(@RequestBody MessagePushRecordEntity request) { |
|
||||||
return R.status(messagePushRecordService.save(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@PostMapping("/update") |
|
||||||
@ApiOperation("更新消息推送记录") |
|
||||||
@ApiOperationSupport(order = 2) |
|
||||||
public R<Boolean> update(@RequestBody MessagePushRecordEntity request) { |
|
||||||
return R.status(messagePushRecordService.updateById(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@GetMapping("/list") |
|
||||||
@ApiOperation("查询消息推送记录列表") |
|
||||||
@ApiOperationSupport(order = 3) |
|
||||||
public R<List<MessagePushRecordEntity>> list(MessagePushRecordEntity request) { |
|
||||||
return R.data(messagePushRecordService.list(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@GetMapping("/listPage") |
|
||||||
@ApiOperation("分页查询消息推送记录列表") |
|
||||||
@ApiOperationSupport(order = 4) |
|
||||||
public R<IPage<MessagePushRecordEntity>> listPage(MessagePushRecordEntity request, Query query) { |
|
||||||
return R.data(messagePushRecordService.listPage(request,query)); |
|
||||||
} |
|
||||||
|
|
||||||
@GetMapping("/send/{id}") |
|
||||||
@ApiOperation("推送消息记录") |
|
||||||
@ApiOperationSupport(order = 4) |
|
||||||
public R<Boolean> send(@PathVariable @ApiParam("消息记录ID") String id) { |
|
||||||
return R.data(messagePushRecordService.send(id)); |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,66 +0,0 @@ |
|||||||
package com.hnac.hzims.message.controller; |
|
||||||
|
|
||||||
import com.aliyun.oss.ServiceException; |
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
||||||
import com.hnac.hzims.message.entity.config.MessageTemplateEntity; |
|
||||||
import com.hnac.hzims.message.service.IMessageTemplateService; |
|
||||||
import groovy.util.logging.Slf4j; |
|
||||||
import io.swagger.annotations.Api; |
|
||||||
import io.swagger.annotations.ApiOperation; |
|
||||||
import lombok.AllArgsConstructor; |
|
||||||
import org.springblade.core.boot.ctrl.BladeController; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
import org.springblade.core.tool.api.R; |
|
||||||
import org.springblade.core.tool.utils.Func; |
|
||||||
import org.springframework.util.Assert; |
|
||||||
import org.springframework.web.bind.annotation.*; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
@RestController |
|
||||||
@AllArgsConstructor |
|
||||||
@RequestMapping("/message/template") |
|
||||||
@Api(value = "消息模板管理",tags = "消息模板管理") |
|
||||||
public class MessageTemplateController extends BladeController { |
|
||||||
|
|
||||||
private final IMessageTemplateService messageTemplateService; |
|
||||||
|
|
||||||
@PostMapping("/save") |
|
||||||
@ApiOperation("保存消息模板") |
|
||||||
@ApiOperationSupport(order = 1) |
|
||||||
public R<Boolean> save(@RequestBody MessageTemplateEntity request) { |
|
||||||
return R.status(messageTemplateService.save(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@GetMapping("/list") |
|
||||||
@ApiOperation("查询列表") |
|
||||||
@ApiOperationSupport(order = 2) |
|
||||||
public R<List<MessageTemplateEntity>> list(MessageTemplateEntity request) { |
|
||||||
return R.data(messageTemplateService.list(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@GetMapping("/listPage") |
|
||||||
@ApiOperation("分页查询") |
|
||||||
@ApiOperationSupport(order = 3) |
|
||||||
public R<IPage<MessageTemplateEntity>> listPage(MessageTemplateEntity request, Query query) { |
|
||||||
return R.data(messageTemplateService.listPage(request,query)); |
|
||||||
} |
|
||||||
|
|
||||||
@DeleteMapping("/delete/{ids}") |
|
||||||
@ApiOperation("删除消息模板") |
|
||||||
@ApiOperationSupport(order = 4) |
|
||||||
public R<Boolean> delete(@PathVariable String ids) { |
|
||||||
return R.status(messageTemplateService.deleteLogic(Func.toLongList(",",ids))); |
|
||||||
} |
|
||||||
|
|
||||||
@PutMapping("/update") |
|
||||||
@ApiOperation("修改消息模板") |
|
||||||
@ApiOperationSupport(order = 5) |
|
||||||
public R<Boolean> update(@RequestBody MessageTemplateEntity request) { |
|
||||||
Assert.isTrue(Func.isNotEmpty(request.getId()),() -> { |
|
||||||
throw new ServiceException("消息模板编辑时传入ID不能为空"); |
|
||||||
}); |
|
||||||
return R.status(messageTemplateService.updateById(request)); |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,8 +0,0 @@ |
|||||||
package com.hnac.hzims.message.mapper; |
|
||||||
|
|
||||||
import com.hnac.hzims.message.entity.MessagePushRecordEntity; |
|
||||||
import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; |
|
||||||
|
|
||||||
public interface MessagePushRecordMapper extends UserDataScopeBaseMapper<MessagePushRecordEntity> { |
|
||||||
|
|
||||||
} |
|
||||||
@ -1,112 +1,135 @@ |
|||||||
package com.hnac.hzims.message.schedule; |
package com.hnac.hzims.message.schedule; |
||||||
|
|
||||||
|
import cn.hutool.core.map.MapUtil; |
||||||
import com.alibaba.fastjson.JSON; |
import com.alibaba.fastjson.JSON; |
||||||
|
import com.alibaba.fastjson.JSONArray; |
||||||
import com.alibaba.fastjson.JSONObject; |
import com.alibaba.fastjson.JSONObject; |
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
||||||
import com.hnac.hzims.common.utils.DateUtil; |
import com.hnac.hzims.common.utils.DateUtil; |
||||||
import com.hnac.hzims.message.MessageConstants; |
import com.hnac.hzims.message.configure.service.ISmsConfigService; |
||||||
import com.hnac.hzims.message.config.MessageFactory; |
import com.hnac.hzims.message.constants.RedisKeyConstants; |
||||||
import com.hnac.hzims.message.entity.MessagePushRecordEntity; |
import com.hnac.hzims.message.dto.PushMessageDTO; |
||||||
import com.hnac.hzims.message.entity.config.MessageTemplateEntity; |
import com.hnac.hzims.message.dto.SmsPushDto; |
||||||
import com.hnac.hzims.message.service.IMessagePushRecordService; |
import com.hnac.hzims.message.entity.PushMessageEntity; |
||||||
import com.hnac.hzims.message.service.IMessageService; |
import com.hnac.hzims.message.entity.config.SmsConfigEntity; |
||||||
import com.hnac.hzims.message.service.IMessageTemplateService; |
import com.hnac.hzims.message.push.service.IPushService; |
||||||
|
import com.hnac.hzims.message.service.IPushMessageService; |
||||||
import com.xxl.job.core.biz.model.ReturnT; |
import com.xxl.job.core.biz.model.ReturnT; |
||||||
import com.xxl.job.core.handler.annotation.XxlJob; |
import com.xxl.job.core.handler.annotation.XxlJob; |
||||||
import lombok.AllArgsConstructor; |
import com.xxl.job.core.log.XxlJobLogger; |
||||||
import lombok.extern.slf4j.Slf4j; |
import lombok.extern.slf4j.Slf4j; |
||||||
|
import org.springblade.core.tool.api.R; |
||||||
|
import org.springblade.core.tool.utils.BeanUtil; |
||||||
|
import org.springblade.core.tool.utils.CollectionUtil; |
||||||
import org.springblade.core.tool.utils.Func; |
import org.springblade.core.tool.utils.Func; |
||||||
import org.springblade.core.tool.utils.ObjectUtil; |
import org.springframework.beans.factory.annotation.Autowired; |
||||||
|
import org.springframework.beans.factory.annotation.Qualifier; |
||||||
|
import org.springframework.data.redis.core.RedisTemplate; |
||||||
import org.springframework.stereotype.Component; |
import org.springframework.stereotype.Component; |
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull; |
||||||
import java.time.LocalDateTime; |
import java.time.LocalDateTime; |
||||||
import java.util.HashMap; |
import java.time.ZoneOffset; |
||||||
import java.util.List; |
import java.util.*; |
||||||
import java.util.Map; |
|
||||||
import java.util.stream.Collectors; |
import java.util.stream.Collectors; |
||||||
|
|
||||||
import static com.hnac.hzims.message.constants.XxlJobConstants.PUSH_MESSAGE_BY_NOTICE; |
import static com.hnac.hzims.message.constants.XxlJobConstants.*; |
||||||
import static com.hnac.hzims.message.constants.XxlJobConstants.PUSH_SMS_MESSAGE_BY_NOTICE; |
|
||||||
|
|
||||||
/** |
/** |
||||||
* @ClassName MessagePushSchedule |
* 消息中心定时推送任务调度 |
||||||
* @description: 消息推送 |
* @author hx |
||||||
* @author: hx |
*/ |
||||||
* @create: 2023-04-04 14:31 |
|
||||||
* @Version 4.0 |
|
||||||
**/ |
|
||||||
@Component |
@Component |
||||||
@AllArgsConstructor |
|
||||||
@Slf4j |
@Slf4j |
||||||
public class MessagePushSchedule { |
public class MessagePushSchedule { |
||||||
private final IMessageTemplateService templateService; |
@Autowired |
||||||
private final IMessagePushRecordService recordService; |
private ISmsConfigService smsConfigService; |
||||||
|
@Autowired |
||||||
|
private IPushMessageService pushMessageService; |
||||||
|
@Autowired |
||||||
|
@Qualifier("smsPushService") |
||||||
|
private IPushService pushService; |
||||||
|
|
||||||
@XxlJob(PUSH_MESSAGE_BY_NOTICE) |
public static final String MESSAGE_ID = "messageId"; |
||||||
|
|
||||||
|
/** |
||||||
|
* 消息推送根据推送人分时段推送任务调度 |
||||||
|
* @param params 暂不支持参数参入执行调度任务 |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
@XxlJob(PUSH_SMS_MESSAGE_BY_NOTICE) |
||||||
public ReturnT pushSmsMessageByNotice(String params) { |
public ReturnT pushSmsMessageByNotice(String params) { |
||||||
// 获取消息模板
|
List<SmsConfigEntity> list = smsConfigService.list(); |
||||||
List<MessageTemplateEntity> templateList = templateService.list(); |
list.stream().filter(e -> Func.isNotEmpty(e.getDuration()) && Func.isNotEmpty(e.getTimeUnit())).forEach(smsConfigEntity -> { |
||||||
LocalDateTime now = LocalDateTime.now(); |
//查询出规定时段内的短信数量统一发送
|
||||||
templateList.forEach(template -> { |
// 获取配置的时间范围内的消息
|
||||||
LocalDateTime endTime = DateUtil.plus(LocalDateTime.now(), template.getConcentratedDuration(), template.getConcentratedTimeUnit()); |
LocalDateTime endTime = DateUtil.plus(LocalDateTime.now(), smsConfigEntity.getDuration(), smsConfigEntity.getTimeUnit()); |
||||||
endTime = DateUtil.plus(endTime, template.getAdvanceDuration(), template.getAdvanceTimeUnit()); |
PushMessageDTO pushMessageDTO = new PushMessageDTO(); |
||||||
LambdaQueryWrapper<MessagePushRecordEntity> lqw = Wrappers.<MessagePushRecordEntity>lambdaQuery() |
pushMessageDTO.setStartTime(LocalDateTime.now()); |
||||||
.eq(MessagePushRecordEntity::getStatus, MessageConstants.NOT_PUSH) |
pushMessageDTO.setEndTime(endTime); |
||||||
.ge(MessagePushRecordEntity::getPlanTime, now) |
pushMessageDTO.setBusinessKey(smsConfigEntity.getBusinessKey()); |
||||||
.le(MessagePushRecordEntity::getPlanTime, endTime); |
pushMessageDTO.setIsPush(false); |
||||||
List<MessagePushRecordEntity> list = recordService.list(lqw); |
List<PushMessageEntity> pushMessageList = pushMessageService.list(pushMessageDTO); |
||||||
this.sendMessage(list); |
XxlJobLogger.log("开始推送短信，推送条数为："+pushMessageList.size()); |
||||||
}); |
// 获取推送消息内容体 根据用户拆分出多条短信推送
|
||||||
return ReturnT.SUCCESS; |
List<JSONObject> splitSmsList = this.transform(pushMessageList); |
||||||
|
if(CollectionUtil.isEmpty(splitSmsList)) { |
||||||
|
return; |
||||||
} |
} |
||||||
|
this.push(splitSmsList,smsConfigEntity); |
||||||
|
|
||||||
/** @Author hx |
|
||||||
* @Description 消息集中推送 |
|
||||||
* @Date 2023/4/4 15:31 |
|
||||||
* @Param [list] 消息推送记录 |
|
||||||
* @return void |
|
||||||
**/ |
|
||||||
private void sendMessage(List<MessagePushRecordEntity> list) { |
|
||||||
Map<String, List<MessagePushRecordEntity>> collect = list.stream().collect(Collectors.groupingBy(MessagePushRecordEntity::getAccount)); |
|
||||||
String type = list.get(0).getType(); |
|
||||||
IMessageService service = MessageFactory.getMessageSend(type); |
|
||||||
collect.forEach((account,records) -> { |
|
||||||
MessagePushRecordEntity request = records.get(0); |
|
||||||
// 完善推送内容
|
|
||||||
request.setContent(this.getPushContent(type,records)); |
|
||||||
Boolean flag = service.send(request); |
|
||||||
List<Long> ids = records.stream().map(MessagePushRecordEntity::getId).collect(Collectors.toList()); |
|
||||||
// 更新消息推送状态
|
|
||||||
LambdaUpdateWrapper<MessagePushRecordEntity> lwq = Wrappers.<MessagePushRecordEntity>lambdaUpdate() |
|
||||||
.set(MessagePushRecordEntity::getStatus, flag ? MessageConstants.PUSH_SUCCESS : MessageConstants.PUSH_FAILED) |
|
||||||
.set(MessagePushRecordEntity::getPushTime,LocalDateTime.now()) |
|
||||||
.in(MessagePushRecordEntity::getId, ids); |
|
||||||
recordService.update(lwq); |
|
||||||
}); |
}); |
||||||
|
return ReturnT.SUCCESS; |
||||||
} |
} |
||||||
|
|
||||||
/** @Author hx |
/** |
||||||
* @Description 获取群推送内容 |
* 推送短信 |
||||||
* @Date 2023/4/4 16:06 |
* @param splitSmsList 短信内容 |
||||||
* @Param [type, list] |
* @param configEntity 短信配置 |
||||||
* @return java.lang.String |
*/ |
||||||
**/ |
private void push(List<JSONObject> splitSmsList,SmsConfigEntity configEntity) { |
||||||
private String getPushContent(String type,List<MessagePushRecordEntity> list) { |
Map<String, List<JSONObject>> phoneMap = splitSmsList.stream().collect(Collectors.groupingBy(sms -> sms.getString("phones"))); |
||||||
if(MessageConstants.APP_NAME.equals(type)) { |
phoneMap.forEach((phone,messages) -> { |
||||||
return list.stream().map(MessagePushRecordEntity::getContent).collect(Collectors.joining("\r\n")); |
String messageIds = messages.stream().map(message -> message.getString(MESSAGE_ID)).collect(Collectors.joining(",")); |
||||||
} |
List<SmsPushDto> smsPushDtoList = JSONArray.parseArray(JSON.toJSONString(messages), SmsPushDto.class); |
||||||
else if(MessageConstants.SMS_PUSH.equals(type)) { |
SmsPushDto templatePush = smsPushDtoList.get(0); |
||||||
Map<String,String> params = new HashMap<>(); |
Map<String,String> params = new HashMap<>(); |
||||||
list.stream().map(MessagePushRecordEntity::getContent).forEachOrdered(record -> { |
Arrays.stream(configEntity.getContentVariables().split(",")).forEachOrdered(contentVariable ->{ |
||||||
JSONObject param = JSONObject.parseObject(record); |
String value = smsPushDtoList.stream().map(SmsPushDto::getParams) |
||||||
param.forEach((k,v) -> { |
.map(pm -> MapUtil.getStr(pm,contentVariable)).collect(Collectors.joining(",")); |
||||||
params.put(k, params.containsKey(k) && Func.isNotEmpty(params.get(k)) ? params.get(k) + "," + v : (String) v); |
params.put(contentVariable,value); |
||||||
}); |
}); |
||||||
|
templatePush.setParams(params); |
||||||
|
XxlJobLogger.log(">>>>>>>>>>开始推送消息，推送内容为："+JSONObject.toJSONString(templatePush)+"<<<<<<<<<<"); |
||||||
|
LambdaUpdateWrapper<PushMessageEntity> pushLU = Wrappers.<PushMessageEntity>lambdaUpdate() |
||||||
|
.set(PushMessageEntity::getIsPush, true) |
||||||
|
.in(PushMessageEntity::getId, messageIds.split(",")); |
||||||
|
pushMessageService.update(pushLU); |
||||||
|
R pushResult = pushService.send(templatePush); |
||||||
|
LambdaUpdateWrapper<PushMessageEntity> successLU = Wrappers.lambdaUpdate(); |
||||||
|
if(pushResult.isSuccess()) { |
||||||
|
successLU.set(PushMessageEntity::getIsSuccess,true); |
||||||
|
} |
||||||
|
else { |
||||||
|
successLU.set(PushMessageEntity::getIsSuccess,false); |
||||||
|
} |
||||||
|
successLU.in(PushMessageEntity::getId, messageIds.split(",")); |
||||||
|
pushMessageService.update(successLU); |
||||||
}); |
}); |
||||||
return JSON.toJSONString(params); |
|
||||||
} |
} |
||||||
return null; |
|
||||||
|
/** |
||||||
|
* 获取推送消息内容体 根据用户拆分出多条短信推送 |
||||||
|
* @param pushMessageList |
||||||
|
* @return |
||||||
|
*/ |
||||||
|
private List<JSONObject> transform(List<PushMessageEntity> pushMessageList) { |
||||||
|
return pushMessageList.stream().map(m -> { |
||||||
|
JSONObject object = JSONObject.parseObject(m.getMessageContent()); |
||||||
|
object.put(MESSAGE_ID,m.getId()); |
||||||
|
return object; |
||||||
|
}).filter(object -> Func.isNotEmpty(object.getString("phones"))).collect(Collectors.toList()); |
||||||
} |
} |
||||||
|
|
||||||
} |
} |
||||||
|
|||||||
@ -1,130 +0,0 @@ |
|||||||
package com.hnac.hzims.message.schedule; |
|
||||||
|
|
||||||
import cn.hutool.core.map.MapUtil; |
|
||||||
import com.alibaba.fastjson.JSON; |
|
||||||
import com.alibaba.fastjson.JSONArray; |
|
||||||
import com.alibaba.fastjson.JSONObject; |
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
||||||
import com.hnac.hzims.common.utils.DateUtil; |
|
||||||
import com.hnac.hzims.message.configure.service.ISmsConfigService; |
|
||||||
import com.hnac.hzims.message.dto.PushMessageDTO; |
|
||||||
import com.hnac.hzims.message.dto.SmsPushDto; |
|
||||||
import com.hnac.hzims.message.entity.PushMessageEntity; |
|
||||||
import com.hnac.hzims.message.entity.config.SmsConfigEntity; |
|
||||||
import com.hnac.hzims.message.push.service.IPushService; |
|
||||||
import com.hnac.hzims.message.service.IPushMessageService; |
|
||||||
import com.xxl.job.core.biz.model.ReturnT; |
|
||||||
import com.xxl.job.core.handler.annotation.XxlJob; |
|
||||||
import com.xxl.job.core.log.XxlJobLogger; |
|
||||||
import lombok.extern.slf4j.Slf4j; |
|
||||||
import org.springblade.core.tool.api.R; |
|
||||||
import org.springblade.core.tool.utils.CollectionUtil; |
|
||||||
import org.springblade.core.tool.utils.Func; |
|
||||||
import org.springframework.beans.factory.annotation.Autowired; |
|
||||||
import org.springframework.beans.factory.annotation.Qualifier; |
|
||||||
import org.springframework.stereotype.Component; |
|
||||||
|
|
||||||
import java.time.LocalDateTime; |
|
||||||
import java.util.*; |
|
||||||
import java.util.stream.Collectors; |
|
||||||
|
|
||||||
import static com.hnac.hzims.message.constants.XxlJobConstants.*; |
|
||||||
|
|
||||||
/** |
|
||||||
* 消息中心定时推送任务调度 |
|
||||||
* @author hx |
|
||||||
*/ |
|
||||||
@Component |
|
||||||
@Slf4j |
|
||||||
public class MessagePushScheduleOld { |
|
||||||
@Autowired |
|
||||||
private ISmsConfigService smsConfigService; |
|
||||||
@Autowired |
|
||||||
private IPushMessageService pushMessageService; |
|
||||||
@Autowired |
|
||||||
@Qualifier("smsPushService") |
|
||||||
private IPushService pushService; |
|
||||||
|
|
||||||
public static final String MESSAGE_ID = "messageId"; |
|
||||||
|
|
||||||
/** |
|
||||||
* 消息推送根据推送人分时段推送任务调度 |
|
||||||
* @param params 暂不支持参数参入执行调度任务 |
|
||||||
* @return |
|
||||||
*/ |
|
||||||
@XxlJob(PUSH_SMS_MESSAGE_BY_NOTICE) |
|
||||||
public ReturnT pushSmsMessageByNotice(String params) { |
|
||||||
List<SmsConfigEntity> list = smsConfigService.list(); |
|
||||||
list.stream().filter(e -> Func.isNotEmpty(e.getDuration()) && Func.isNotEmpty(e.getTimeUnit())).forEach(smsConfigEntity -> { |
|
||||||
//查询出规定时段内的短信数量统一发送
|
|
||||||
// 获取配置的时间范围内的消息
|
|
||||||
LocalDateTime endTime = DateUtil.plus(LocalDateTime.now(), smsConfigEntity.getDuration(), smsConfigEntity.getTimeUnit()); |
|
||||||
PushMessageDTO pushMessageDTO = new PushMessageDTO(); |
|
||||||
pushMessageDTO.setStartTime(LocalDateTime.now()); |
|
||||||
pushMessageDTO.setEndTime(endTime); |
|
||||||
pushMessageDTO.setBusinessKey(smsConfigEntity.getBusinessKey()); |
|
||||||
pushMessageDTO.setIsPush(false); |
|
||||||
List<PushMessageEntity> pushMessageList = pushMessageService.list(pushMessageDTO); |
|
||||||
XxlJobLogger.log("开始推送短信，推送条数为："+pushMessageList.size()); |
|
||||||
// 获取推送消息内容体 根据用户拆分出多条短信推送
|
|
||||||
List<JSONObject> splitSmsList = this.transform(pushMessageList); |
|
||||||
if(CollectionUtil.isEmpty(splitSmsList)) { |
|
||||||
return; |
|
||||||
} |
|
||||||
this.push(splitSmsList,smsConfigEntity); |
|
||||||
|
|
||||||
}); |
|
||||||
return ReturnT.SUCCESS; |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* 推送短信 |
|
||||||
* @param splitSmsList 短信内容 |
|
||||||
* @param configEntity 短信配置 |
|
||||||
*/ |
|
||||||
private void push(List<JSONObject> splitSmsList,SmsConfigEntity configEntity) { |
|
||||||
Map<String, List<JSONObject>> phoneMap = splitSmsList.stream().collect(Collectors.groupingBy(sms -> sms.getString("phones"))); |
|
||||||
phoneMap.forEach((phone,messages) -> { |
|
||||||
String messageIds = messages.stream().map(message -> message.getString(MESSAGE_ID)).collect(Collectors.joining(",")); |
|
||||||
List<SmsPushDto> smsPushDtoList = JSONArray.parseArray(JSON.toJSONString(messages), SmsPushDto.class); |
|
||||||
SmsPushDto templatePush = smsPushDtoList.get(0); |
|
||||||
Map<String,String> params = new HashMap<>(); |
|
||||||
Arrays.stream(configEntity.getContentVariables().split(",")).forEachOrdered(contentVariable ->{ |
|
||||||
String value = smsPushDtoList.stream().map(SmsPushDto::getParams) |
|
||||||
.map(pm -> MapUtil.getStr(pm,contentVariable)).collect(Collectors.joining(",")); |
|
||||||
params.put(contentVariable,value); |
|
||||||
}); |
|
||||||
templatePush.setParams(params); |
|
||||||
XxlJobLogger.log(">>>>>>>>>>开始推送消息，推送内容为："+JSONObject.toJSONString(templatePush)+"<<<<<<<<<<"); |
|
||||||
LambdaUpdateWrapper<PushMessageEntity> pushLU = Wrappers.<PushMessageEntity>lambdaUpdate() |
|
||||||
.set(PushMessageEntity::getIsPush, true) |
|
||||||
.in(PushMessageEntity::getId, messageIds.split(",")); |
|
||||||
pushMessageService.update(pushLU); |
|
||||||
R pushResult = pushService.send(templatePush); |
|
||||||
LambdaUpdateWrapper<PushMessageEntity> successLU = Wrappers.lambdaUpdate(); |
|
||||||
if(pushResult.isSuccess()) { |
|
||||||
successLU.set(PushMessageEntity::getIsSuccess,true); |
|
||||||
} |
|
||||||
else { |
|
||||||
successLU.set(PushMessageEntity::getIsSuccess,false); |
|
||||||
} |
|
||||||
successLU.in(PushMessageEntity::getId, messageIds.split(",")); |
|
||||||
pushMessageService.update(successLU); |
|
||||||
}); |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* 获取推送消息内容体 根据用户拆分出多条短信推送 |
|
||||||
* @param pushMessageList |
|
||||||
* @return |
|
||||||
*/ |
|
||||||
private List<JSONObject> transform(List<PushMessageEntity> pushMessageList) { |
|
||||||
return pushMessageList.stream().map(m -> { |
|
||||||
JSONObject object = JSONObject.parseObject(m.getMessageContent()); |
|
||||||
object.put(MESSAGE_ID,m.getId()); |
|
||||||
return object; |
|
||||||
}).filter(object -> Func.isNotEmpty(object.getString("phones"))).collect(Collectors.toList()); |
|
||||||
} |
|
||||||
|
|
||||||
} |
|
||||||
@ -1,35 +0,0 @@ |
|||||||
package com.hnac.hzims.message.service; |
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.hnac.hzims.message.entity.MessagePushRecordEntity; |
|
||||||
import org.springblade.core.mp.base.BaseService; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
public interface IMessagePushRecordService extends BaseService<MessagePushRecordEntity> { |
|
||||||
|
|
||||||
/** |
|
||||||
* 查询消息推送记录列表 |
|
||||||
* @param request 查询条件 |
|
||||||
* @return 消息记录列表 |
|
||||||
*/ |
|
||||||
List<MessagePushRecordEntity> list(MessagePushRecordEntity request); |
|
||||||
|
|
||||||
/** |
|
||||||
* 分页查询消息推送记录列表 |
|
||||||
* @param request 查询条件 |
|
||||||
* @param query 分页 |
|
||||||
* @return 消息记录列表 |
|
||||||
*/ |
|
||||||
IPage<MessagePushRecordEntity> listPage(MessagePushRecordEntity request, Query query); |
|
||||||
|
|
||||||
/** @Author hx |
|
||||||
* @Description 根据ID发送短信 |
|
||||||
* @Date 2023/4/4 17:37 |
|
||||||
* @Param ids 消息记录ID |
|
||||||
* @return |
|
||||||
**/ |
|
||||||
Boolean send(String id); |
|
||||||
|
|
||||||
} |
|
||||||
@ -1,28 +0,0 @@ |
|||||||
package com.hnac.hzims.message.service; |
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.hnac.hzims.message.entity.config.MessageTemplateEntity; |
|
||||||
import org.springblade.core.mp.base.BaseService; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
public interface IMessageTemplateService extends BaseService<MessageTemplateEntity> { |
|
||||||
|
|
||||||
/** |
|
||||||
* 查询消息模板列表 |
|
||||||
* @param req 查询条件 |
|
||||||
* @return 消息模板列表 |
|
||||||
*/ |
|
||||||
List<MessageTemplateEntity> list(MessageTemplateEntity req); |
|
||||||
|
|
||||||
|
|
||||||
/** |
|
||||||
* 分页查询消息 |
|
||||||
* @param req 查询条件 |
|
||||||
* @param query 分页条件 |
|
||||||
* @return 消息模板分页查询结果 |
|
||||||
*/ |
|
||||||
IPage<MessageTemplateEntity> listPage(MessageTemplateEntity req, Query query); |
|
||||||
|
|
||||||
} |
|
||||||
@ -1,55 +0,0 @@ |
|||||||
package com.hnac.hzims.message.service.impl; |
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
||||||
import com.hnac.hzims.message.config.MessageFactory; |
|
||||||
import com.hnac.hzims.message.entity.MessagePushRecordEntity; |
|
||||||
import com.hnac.hzims.message.mapper.MessagePushRecordMapper; |
|
||||||
import com.hnac.hzims.message.service.IMessagePushRecordService; |
|
||||||
import com.hnac.hzims.message.service.IMessageService; |
|
||||||
import lombok.AllArgsConstructor; |
|
||||||
import lombok.extern.slf4j.Slf4j; |
|
||||||
import org.springblade.core.mp.base.BaseServiceImpl; |
|
||||||
import org.springblade.core.mp.support.Condition; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
import org.springblade.core.tool.utils.Func; |
|
||||||
import org.springframework.stereotype.Service; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
@Service |
|
||||||
@AllArgsConstructor |
|
||||||
@Slf4j |
|
||||||
public class MessagePushRecordServiceImpl extends BaseServiceImpl<MessagePushRecordMapper, MessagePushRecordEntity> implements IMessagePushRecordService { |
|
||||||
|
|
||||||
@Override |
|
||||||
public List<MessagePushRecordEntity> list(MessagePushRecordEntity request) { |
|
||||||
return this.list(this.getQueryWrapper(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@Override |
|
||||||
public IPage<MessagePushRecordEntity> listPage(MessagePushRecordEntity request, Query query) { |
|
||||||
return this.page(Condition.getPage(query),this.getQueryWrapper(request)); |
|
||||||
} |
|
||||||
|
|
||||||
@Override |
|
||||||
public Boolean send(String id) { |
|
||||||
MessagePushRecordEntity record = this.getById(id); |
|
||||||
IMessageService messageSend = MessageFactory.getMessageSend(record.getType()); |
|
||||||
return messageSend.send(record); |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* 获取 QueryWrapper |
|
||||||
* @param request 查询条件 |
|
||||||
* @return QueryWrapper |
|
||||||
*/ |
|
||||||
private LambdaQueryWrapper<MessagePushRecordEntity> getQueryWrapper(MessagePushRecordEntity request) { |
|
||||||
LambdaQueryWrapper<MessagePushRecordEntity> lambda = Condition.getQueryWrapper(request).lambda(); |
|
||||||
if(Func.isNotEmpty(request.getStatus())) { |
|
||||||
lambda.eq(MessagePushRecordEntity::getStatus,request.getStatus()); |
|
||||||
} |
|
||||||
return lambda; |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,44 +0,0 @@ |
|||||||
package com.hnac.hzims.message.service.impl; |
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
||||||
import com.hnac.hzims.common.utils.Condition; |
|
||||||
import com.hnac.hzims.message.entity.config.MessageTemplateEntity; |
|
||||||
import com.hnac.hzims.message.mapper.MessageTemplateMapper; |
|
||||||
import com.hnac.hzims.message.service.IMessageTemplateService; |
|
||||||
import groovy.util.logging.Slf4j; |
|
||||||
import lombok.AllArgsConstructor; |
|
||||||
import org.springblade.core.mp.base.BaseServiceImpl; |
|
||||||
import org.springblade.core.mp.support.Query; |
|
||||||
import org.springblade.core.tool.utils.Func; |
|
||||||
import org.springframework.stereotype.Service; |
|
||||||
|
|
||||||
import java.util.List; |
|
||||||
|
|
||||||
@Service |
|
||||||
@AllArgsConstructor |
|
||||||
@Slf4j |
|
||||||
public class MessageTemplateServiceImpl extends BaseServiceImpl<MessageTemplateMapper, MessageTemplateEntity> implements IMessageTemplateService { |
|
||||||
@Override |
|
||||||
public List<MessageTemplateEntity> list(MessageTemplateEntity req) { |
|
||||||
return this.list(this.getQueryWrapper(req)); |
|
||||||
} |
|
||||||
|
|
||||||
@Override |
|
||||||
public IPage<MessageTemplateEntity> listPage(MessageTemplateEntity req, Query query) { |
|
||||||
return this.page(Condition.getPage(query) , this.getQueryWrapper(req)); |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* 根据查询条件获取消息模板QueryWrapper |
|
||||||
* @param req 查询条件 |
|
||||||
* @return 消息模板QueryWrapper |
|
||||||
*/ |
|
||||||
private LambdaQueryWrapper<MessageTemplateEntity> getQueryWrapper(MessageTemplateEntity req) { |
|
||||||
LambdaQueryWrapper<MessageTemplateEntity> lambda = Condition.getQueryWrapper(req).lambda(); |
|
||||||
if(Func.isNotEmpty(req.getStatus())) { |
|
||||||
lambda.eq(MessageTemplateEntity::getStatus,req.getStatus()); |
|
||||||
} |
|
||||||
return lambda; |
|
||||||
} |
|
||||||
} |
|
||||||
Loading…
Reference in new issue