add:消息添加二级图标类型

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/Mapper.java

@@ -1,7 +1,10 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class Mapper {
 
+	@ApiModelProperty("SYSTEM：系统消息  COURSE:课程信息 NOTICE:公告")
 	private Object key;
 	
 	private Object value;

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

@@ -15,6 +15,12 @@ public class SysMessage extends BaseEntity {
 
 	/** 主键 */
 	private Long id;
+
+	@ApiModelProperty("消息配置表id")
+	private Long messageConfigId;
+
+	@ApiModelProperty("TEACHER_AUTH:老师认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱,COURSE:课程,INCOME:收入,HOMEWORK:作业,EVALUATE:评价,GROUP_CHAT:群聊,VIP:会员")
+	private String subType;
 	
 	/** 标题 */
 	@ApiModelProperty(value = "标题",required = false)
@@ -205,4 +211,19 @@ public class SysMessage extends BaseEntity {
 		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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.yonge.cooleshow.biz.dal.enums.MessageIconTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
@@ -15,6 +16,9 @@ public class SysMessageConfig {
 	/** 消息类型 */
 	private MessageTypeEnum messageType;
 
+	/** 消息二级类型  */
+	private MessageIconTypeEnum  subType;
+
 	/** 消息内容 */
 	private String content;
 
@@ -100,4 +104,11 @@ public class SysMessageConfig {
 		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/enums/MessageIconTypeEnum.java

@@ -0,0 +1,56 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-09
+ */
+public enum MessageIconTypeEnum implements BaseEnum<String,MessageIconTypeEnum> {
+
+    TEACHER_AUTH("TEACHER_AUTH","老师认证"),
+    MUSICIAN_AUTH("MUSICIAN_AUTH","音乐人认证"),
+    PRACTICE("PRACTICE","陪练课"),
+    LIVE("LIVE","直播课"),
+    VIDEO("VIDEO","视频课"),
+    MUSIC_SHEET("MUSIC_SHEET","乐谱"),
+    COURSE("COURSE","课程"),
+    INCOME("INCOME","收入"),
+    HOMEWORK("HOMEWORK","作业"),
+    EVALUATE("EVALUATE","评价"),
+    GROUP_CHAT("GROUP_CHAT","群聊"),
+    VIP("VIP","会员"),
+
+    ;
+
+    MessageIconTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @EnumValue
+    private String code;
+
+    private String msg;
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+
+}

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

@@ -112,7 +112,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 * @return
 	 */
 	private int addMessage(Map<Long, String> receivers, String subject, String content, Date triggerTime, MessageSendMode mode, SendStatusEnum status,
-			String errorMsg, Integer readStatus, String memo, String group,String jpushType) {
+			String errorMsg, Integer readStatus, String memo, String group,String jpushType,Long messageConfigId) {
 		SysMessage message = null;
 		Date date = new Date();
 
@@ -148,6 +148,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setMemo(memo);
 			message.setGroup(group);
 			message.setClientId(jpushType);
+			message.setMessageConfigId(messageConfigId);
 			messages.add(message);
 		}
 
@@ -245,7 +246,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			mode = MessageSendMode.EMAIL;
 		}
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
-				url, messageConfig.getGroup(),jpushType);
+				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
 	@Override
@@ -282,7 +283,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			}
 		}
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, MessageSendMode.PUSH, status, errorMsg, readStatus,
-				url, messageConfig.getGroup(),jpushType);
+				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
 	@Override
@@ -319,7 +320,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		Map<Long, String> receivers = new HashMap<Long, String>();
 		receivers.put(userId, receiver);
-		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
+		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType,null);
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@
 		<result column="description_" property="description" />
 		<result column="modify_on_" property="modifyOn" />
 		<result column="url_" property="url" />
+		<result column="sub_type_" property="subType" />
 		<result column="group_" property="group" />
 		<result column="send_flag_" property="sendFlag" />
 	</resultMap>
@@ -54,8 +55,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_message_config
-		(id_,message_type_,content_,description_,modify_on_,url_,group_)
-		VALUES(#{id},#{messageType},#{content},#{description},#{modifyOn},#{url},#{group})
+		(id_,message_type_,content_,description_,modify_on_,url_,group_,sub_type_)
+		VALUES(#{id},#{messageType},#{content},#{description},#{modifyOn},#{url},#{group},#{subType})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -84,7 +85,10 @@
 				description_ = #{description},
 			</if>
 			<if test="sendFlag != null">
-				send_flag_ = #{sendFlag}
+				send_flag_ = #{sendFlag},
+			</if>
+			<if test="subType != null">
+				sub_type_ = #{subType}
 			</if>
 		</set>
 		WHERE id_ = #{id}

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

@@ -18,6 +18,8 @@
         <result column="create_on_" property="createOn"/>
         <result column="modify_on_" property="modifyOn"/>
         <result column="user_id_" property="userId"/>
+        <result column="message_config_id_" property="messageConfigId"/>
+        <result column="sub_type_" property="subType"/>
         <result column="memo_" property="memo"/>
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
@@ -81,9 +83,9 @@
 
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysMessage">
 		insert into sys_message (user_id_,title_, content_,type_, receiver_,
-		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,client_id_)
+		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,client_id_,message_config_id_)
 		values (#{userId}, #{title},#{content},#{type},
-				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{clientId})
+				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{clientId},#{messageConfigId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysMessage">
@@ -91,7 +93,7 @@
 		title_, content_,
 		type_, status_, receiver_,
 		send_time_, error_msg_,read_status_,memo_, create_on_,
-		modify_on_,group_,client_id_)
+		modify_on_,group_,client_id_,message_config_id_)
 		values
 		<foreach collection="list" item="item" index="index"
 			separator=",">
@@ -102,7 +104,7 @@
 			#{item.status}, #{item.receiver,jdbcType=VARCHAR},
 			#{item.sendTime},#{item.errorMsg,jdbcType=VARCHAR},#{item.readStatus},#{item.memo},
 			#{item.createOn},
-			#{item.modifyOn},#{item.group},#{item.clientId})
+			#{item.modifyOn},#{item.group},#{item.clientId},#{item.messageConfigId})
 		</foreach>
 	</insert>
 
@@ -148,6 +150,9 @@
 			<if test="group != null">
 				group_ = #{group},
 			</if>
+			<if test="messageConfigId != null">
+				message_config_id_ = #{messageConfigId},
+			</if>
 		</set>
 		where id_ = #{id,jdbcType=BIGINT}
 	</update>
@@ -168,7 +173,10 @@
 	</select>
 
 	<select id="queryPage" parameterType="map" resultMap="message">
-		select m.* from sys_message m
+		select m.*,
+		smc.sub_type_
+		from sys_message m
+		left join sys_message_config smc on m.message_config_id_ = smc.id_
 		<include refid="queryCondition" />
 		order by m.create_on_ desc
 		<include refid="global.limit" />
@@ -190,7 +198,7 @@
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
 		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
-		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &gt;= now()
+		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &lt;= now()
 		<if test="type != null">
 		and type_ = #{type}
 		</if>