消息推送

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SysMessageController.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.student.controller;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
@@ -19,12 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -35,13 +29,9 @@ public class SysMessageController extends BaseController {
 
 	@Autowired
 	private SysMessageService sysMessageService;
-
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
-	@Autowired
-	private AppVersionInfoDao appVersionInfoDao;
-
 	@ApiOperation("获取所有消息列表")
 	@PostMapping(value = "list")
 	public HttpResponseResult<PageInfo<SysMessage>> list(@RequestBody SysMessageQueryInfo queryInfo){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessage.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
@@ -11,6 +12,7 @@ import com.yonge.cooleshow.common.entity.BaseEntity;
 /**
  * 对应数据库表(sys_message):
  */
+@Data
 public class SysMessage extends BaseEntity {
 
 	/** 主键 */
@@ -75,13 +77,8 @@ public class SysMessage extends BaseEntity {
 	@ApiModelProperty(value = "极光推送客户端标识",required = false)
 	private String clientId;
 
-	public String getClientId() {
-		return clientId;
-	}
-
-	public void setClientId(String clientId) {
-		this.clientId = clientId;
-	}
+	@ApiModelProperty(value = "图标",required = false)
+	private String img;
 
 	public SysMessage() {
 	}
@@ -94,137 +91,8 @@ public class SysMessage extends BaseEntity {
 		this.userId = userId;
 		this.memo = memo;
 	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setReceiver(String receiver){
-		this.receiver = receiver;
-	}
-	
-	public String getReceiver(){
-		return this.receiver;
-	}
-			
-	public void setSendTime(java.util.Date sendTime){
-		this.sendTime = sendTime;
-	}
-	
-	public java.util.Date getSendTime(){
-		return this.sendTime;
-	}
-			
-	public void setErrorMsg(String errorMsg){
-		this.errorMsg = errorMsg;
-	}
-	
-	public String getErrorMsg(){
-		return this.errorMsg;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-
-	public MessageSendMode getType() {
-		return type;
-	}
-
-	public void setType(MessageSendMode type) {
-		this.type = type;
-	}
-
-	public SendStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(SendStatusEnum status) {
-		this.status = status;
-	}
-
-	public Integer getReadStatus() {
-		return readStatus;
-	}
-
-	public void setReadStatus(Integer readStatus) {
-		this.readStatus = readStatus;
-	}
-
-	public String getGroup() {
-		return group;
-	}
-
-	public void setGroup(String group) {
-		this.group = group;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
-	public Long getMessageConfigId() {
-		return messageConfigId;
-	}
-
-	public void setMessageConfigId(Long messageConfigId) {
-		this.messageConfigId = messageConfigId;
-	}
-
-	public String getSubType() {
-		return subType;
-	}
-
-	public void setSubType(String subType) {
-		this.subType = subType;
-	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessageConfig.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.entity;
 
 import com.yonge.cooleshow.biz.dal.enums.MessageIconTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
@@ -9,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 /**
  * 对应数据库表(sys_message_config):
  */
+@Data
 public class SysMessageConfig {
 
 	/**  */
@@ -48,112 +50,11 @@ public class SysMessageConfig {
 	@ApiModelProperty("h5跳转链接")
 	private String actionUrl;
 
-	public String getAction() {
-		return action;
-	}
-
-	public void setAction(String action) {
-		this.action = action;
-	}
-
-	public String getPageTag() {
-		return pageTag;
-	}
-
-	public void setPageTag(String pageTag) {
-		this.pageTag = pageTag;
-	}
-
-	public String getParams() {
-		return params;
-	}
-
-	public void setParams(String params) {
-		this.params = params;
-	}
-
-	public String getActionUrl() {
-		return actionUrl;
-	}
-
-	public void setActionUrl(String actionUrl) {
-		this.actionUrl = actionUrl;
-	}
-
-	public Integer getSendFlag() {
-		return sendFlag;
-	}
-
-	public void setSendFlag(Integer sendFlag) {
-		this.sendFlag = sendFlag;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return this.id;
-	}
-
-	public MessageTypeEnum getMessageType() {
-		return messageType;
-	}
-
-	public void setMessageType(MessageTypeEnum messageType) {
-		this.messageType = messageType;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getContent() {
-		return this.content;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getDescription() {
-		return this.description;
-	}
-
-	public void setModifyOn(java.util.Date modifyOn) {
-		this.modifyOn = modifyOn;
-	}
-
-	public java.util.Date getModifyOn() {
-		return this.modifyOn;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getUrl() {
-		return this.url;
-	}
-
-	public String getGroup() {
-		return group;
-	}
-
-	public void setGroup(String group) {
-		this.group = group;
-	}
+	@ApiModelProperty("图标")
+	private String icon;
 
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
-	public MessageIconTypeEnum getSubType() {
-		return subType;
-	}
-
-	public void setSubType(MessageIconTypeEnum subType) {
-		this.subType = subType;
-	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMessageService.java

@@ -16,24 +16,6 @@ import com.yonge.toolset.mybatis.service.BaseService;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext.MessageSender;
 
 public interface SysMessageService extends BaseService<Long, SysMessage> {
-	
-	public PageInfo<SysMessageDto> queryListPage(QueryInfo queryInfo);
-
-	/**
-	 * 修改消息对象
-	 * @param message
-	 * @return
-	 */
-	public int updateMessage(SysMessage message);
-
-	/**
-	 * 推送站内消息
-	 * @param userIds
-	 * @param messageType
-	 * @return
-	 */
-	boolean batchSeoMessage(Set<Long> userIds, MessageTypeEnum messageType,String memo, Object... args);
-
 	/**
 	 * 发送消息
 	 * @param messageSender 消息发送者
@@ -54,19 +36,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 
 
 	/**
-	 * 推送极光自定义消息
-	 * @param messageType 消息类型
-	 * @param receivers 消息接收者（Key:用户编号  value:消息接收对象）
-	 * @param triggerTime 触发时间
-	 * @param readStatus 阅读状态（0-未读  1-已读）
-	 * @param url 超链接地址
-	 * @param args 参数
-	 * @return
-	 */
-	public void batchPushMessage(MessageTypeEnum messageType, Map<Long, String> receivers, Date triggerTime,
-			Integer readStatus, String url,String jpushType,String sound,String channelId, Object... args);
-
-	/**
 	 * 发送消息
 	 * @param messageSender 消息发送者
 	 * @param userId 用户编号
@@ -101,12 +70,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 */
 	public String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr);
 
-	/**
-	 * 删除已有的key
-	 * @param type
-	 * @param mobileNOOrEmailAddr
-	 */
-	public void delSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr);
 
 	/**
 	 * 查询消息未读条数

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -1,53 +1,38 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSON;
-import com.yonge.cooleshow.biz.dal.dto.JumpUrlDto;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.toolset.base.string.MessageFormatter;
-import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dao.SysConfigDao;
 import com.yonge.cooleshow.biz.dal.dao.SysMessageDao;
-import com.yonge.cooleshow.biz.dal.dto.SysMessageDto;
+import com.yonge.cooleshow.biz.dal.dto.JumpUrlDto;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.entity.SysMessageConfig;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.SendStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageConfigService;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
-import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.Mapper;
-import com.yonge.toolset.base.exception.BizException;
-import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.cooleshow.common.redis.service.RedisCache;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.string.MessageFormatter;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext.MessageSender;
-import com.yonge.toolset.utils.collection.MapUtil;
-
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 @Service
 public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> implements SysMessageService {
 
@@ -62,8 +47,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
-	private SysConfigDao sysConfigDao;
-	@Autowired
 	private RedisCache<String, Object> redisCache;
 	// 验证码有效期
 	public static final int CODE_EXPIRE = 60 * 5;
@@ -87,26 +70,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		return sysMessageDao;
 	}
 
-	@Override
-	public PageInfo<SysMessageDto> queryListPage(QueryInfo queryInfo) {
-		PageInfo<SysMessageDto> pageInfo = new PageInfo<SysMessageDto>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<String, Object>();
-		MapUtil.populateMap(params, queryInfo);
-
-		List<SysMessageDto> dataList = null;
-		int count = this.findCount(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = sysMessageDao.queryListPage(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<SysMessageDto>();
-		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
-	}
-
 	/**
 	 * 添加消息
 	 * @param subject 消息主题
@@ -165,52 +128,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		return sysMessageDao.batchInsert(messages);
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int updateMessage(SysMessage message) {
-		return sysMessageDao.update(message);
-	}
-
-	@Override
-	public boolean batchSeoMessage(Set<Long> userIds, MessageTypeEnum messageType,String memo, Object... args) {
-		if(userIds != null){
-			userIds.removeAll(Collections.singleton(null));
-		}
-		if (userIds == null || userIds.size() == 0) {
-			LOGGER.error("接收地址不能为空");
-			return false;
-		}
-		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(messageType.getCode());
-		if (messageConfig == null) {
-			throw new BizException("消息类型错误");
-		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
-			return true;
-		}
-		Date date = new Date();
-		SendStatusEnum status = SendStatusEnum.SUCCESSED;
-		String content = MessageFormatter.arrayFormat(messageConfig.getContent(), args);
-		SysMessage message = null;
-
-		List<SysMessage> messages = new ArrayList<>();
-		for (Long userId : userIds) {
-			message = new SysMessage();
-			message.setUserId(userId);
-			message.setContent(content);
-			message.setCreateOn(date);
-			message.setModifyOn(date);
-			message.setReceiver(userId.toString());
-			message.setSendTime(date);
-			message.setStatus(status);
-			message.setType(MessageSendMode.SEO);
-			message.setTitle(messageConfig.getDescription());
-			message.setReadStatus(0);
-			message.setMemo(memo);
-			message.setGroup(messageConfig.getGroup());
-			messages.add(message);
-		}
-		sysMessageDao.batchInsert(messages);
-		return true;
-	}
 
 	@Override
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
@@ -338,45 +255,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void batchPushMessage(MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-			String url,String jpushType,String sound,String channelId, Object... args) {
-		if (receivers == null || receivers.size() == 0) {
-			throw new BizException("接收地址不能为空");
-		}
-		String[] tos = receivers.values().toArray(new String[receivers.size()]);
-		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type.getCode());
-		if (messageConfig == null) {
-			throw new BizException("消息类型错误");
-		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
-			return;
-		}
-		Date date = new Date();
-		SendStatusEnum status = SendStatusEnum.WAIT;
-		String errorMsg = null;
-		// 立即发送
-		if (triggerTime == null || date.after(triggerTime)) {
-			status = SendStatusEnum.SENDING;
-			try {
-				if (isSendRemoteMessage(MessageSender.JIGUANG)) {
-					errorMsg = messageSenderPluginContext.batchSend(MessageSender.JIGUANG, messageConfig.getDescription(),
-														 MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,sound,channelId);
-					if (StringUtils.isEmpty(errorMsg)) {
-						status = SendStatusEnum.SUCCESSED;
-					}  else {
-						status = SendStatusEnum.FAILED;
-					}
-				}
-			} catch (Exception e) {
-				status = SendStatusEnum.FAILED;
-				errorMsg = e.getMessage();
-				LOGGER.warn("消息发送失败", e);
-			}
-		}
-		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, MessageSendMode.PUSH, status, errorMsg, readStatus,
-				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
-	}
-
-	@Override
 	public void sendMessage(MessageSender messageSender, Long userId, String title, String content, String receiver, Date triggerTime, Integer readStatus, String url, String group,String jpushType) {
 		LOGGER.info("batchSendMessage {}, userId {}, receivers {} ", messageSender, userId, receiver);
 		if (StringUtils.isBlank(receiver)) {
@@ -448,14 +326,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void delSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr) {
-		String key = getVerificationCodeCacheKey(type, mobileNOOrEmailAddr);
-		if (StringUtils.isNotBlank(key)) {
-			redisCache.delete(key);
-		}
-	}
-
-	@Override
 	public List<Mapper> queryCountOfUnread(MessageSendMode type, Long userId, String jpushType) {
 		return sysMessageDao.queryCountOfUnread(type, userId, jpushType);
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -24,6 +24,7 @@
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
         <result column="client_id_" property="clientId"/>
+        <result column="img" property="img"/>
     </resultMap>
     
     <resultMap type="com.yonge.cooleshow.biz.dal.dto.SysMessageDto" id="messageDto" extends="message">
@@ -174,7 +175,7 @@
 
 	<select id="queryPage" parameterType="map" resultMap="message">
 		select m.*,
-		smc.sub_type_
+		smc.sub_type_,smc.icon_ img
 		from sys_message m
 		left join sys_message_config smc on m.message_config_id_ = smc.id_
 		<include refid="queryCondition" />

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/JiguangPushPlugin.java

@@ -94,7 +94,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		android.put("extras", android_extras);
 
 		JSONObject android_intent = new JSONObject();// android额外参数
-		if ("STUDENT".equals(type)) {
+		if ("STUDENT".equals(type) || "TENANT_STUDENT".equals(type)) {
 			android_intent.put("url",
 							   "intent:#Intent;action=cn.jiguang.push.customAction;component=com.cooleshow.student/com.cooleshow.student.ui.main.MainActivity;end");
 		} else {