message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 dd244d57d16a106284a34994e656d3a847a469c2 1 个父辈 28199d11

消息收发表，添加字段

内嵌 并排对比
正在显示 5 个修改的文件 包含 170 行增加 和 112 行删除
... ... @@ -3,15 +3,14 @@ package com.sunyo.wlpt.message.bus.service.domain;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author 子诚
* Description：消息收发记录表(存储七天)
* 时间：2020/7/2 15:21
* Description：消息收发记录表(默认存储七天)
* 时间：2020/7/13 18:58
*/
@Data
... ... @@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class MessageNote implements Serializable {
private static final long serialVersionUID = 6971204112114471516L;
private static final long serialVersionUID = 4952900873210696428L;
/**
* 消息收发记录表的ID
... ... @@ -30,67 +29,70 @@ public class MessageNote implements Serializable {
* 用户的ID
*/
private String userId;
/**
* 所属虚拟主机的ID
* 所属用户登陆名称
*/
private String virtualHostId;
private String username;
/**
* 所属交换机的ID
* 所属服务器的ID
*/
private String exchangeId;
private String serverId;
/**
* 所属队列的ID
* 所属服务器名称
*/
private String queueId;
private String serverName;
/**
* 所属路由键的ID
* 所属虚拟主机的ID
*/
private String routingKeyId;
private String virtualHostId;
/**
* 所属虚拟主机名称
*/
private String virtualHostName;
/**
* 用户登陆名称
* 所属交换机的ID
*/
private String username;
private String exchangeId;
/**
* 服务器名称
* 所属交换机名称
*/
private String serverName;
private String exchangeName;
/**
* 虚拟主机名称
* 所属队列的ID
*/
private String virtualHostName;
private String queueId;
/**
* 交换机名称
* 所属队列名称
*/
private String exchangeName;
private String queueName;
/**
* routing_key的名称
* 所属路由键的ID
*/
private String routingKeyName;
private String routingKeyId;
/**
* 队列名称
* 所属路由键的名称
*/
private String queueName;
private String routingKeyName;
/**
* 消息发送时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sendTime;
/**
* 消息获取时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime;
/**
... ... @@ -101,12 +103,11 @@ public class MessageNote implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtCreate;
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtModified;
}
\ No newline at end of file
... ...
package com.sunyo.wlpt.message.bus.service.mapper;
import com.sunyo.wlpt.message.bus.service.domain.MessageNote;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;import java.util.List;
/**
* @author 子诚
* Description：
* 时间：2020/7/2 15:21
* 时间：2020/7/13 18:58
*/
@Mapper
public interface MessageNoteMapper {
/**
* 删除，根据主键
* delete by primary key
*
* @param id primaryKey
* @return deleteCount
... ... @@ -22,7 +19,7 @@ public interface MessageNoteMapper {
int deleteByPrimaryKey(String id);
/**
* 新增
* insert record to table
*
* @param record the record
* @return insert count
... ... @@ -30,7 +27,7 @@ public interface MessageNoteMapper {
int insert(MessageNote record);
/**
* 新增，选择性
* insert record to table selective
*
* @param record the record
* @return insert count
... ... @@ -38,7 +35,7 @@ public interface MessageNoteMapper {
int insertSelective(MessageNote record);
/**
* 查询，根据主键
* select by primary key
*
* @param id primary key
* @return object by primary key
... ... @@ -46,7 +43,7 @@ public interface MessageNoteMapper {
MessageNote selectByPrimaryKey(String id);
/**
* 更新，根据主键，选择性
* update record selective
*
* @param record the updated record
* @return update count
... ... @@ -54,7 +51,7 @@ public interface MessageNoteMapper {
int updateByPrimaryKeySelective(MessageNote record);
/**
* 更新，根据主键
* update record
*
* @param record the updated record
* @return update count
... ...
... ... @@ -69,3 +69,4 @@ public interface MessageNoteService {
PageInfo selectMessageNoteList(MessageNote messageNote, Integer pageNum, Integer pageSize);
}
... ...
... ... @@ -91,3 +91,4 @@ public class MessageNoteServiceImpl implements MessageNoteService {
}
... ...
... ... @@ -4,74 +4,38 @@
<resultMap id="BaseResultMap" type="com.sunyo.wlpt.message.bus.service.domain.MessageNote">
<!--@mbg.generated-->
<!--@Table message_note-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime"/>
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime"/>
<result column="send_content" jdbcType="BLOB" property="sendContent"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="username" jdbcType="VARCHAR" property="username" />
<result column="server_id" jdbcType="VARCHAR" property="serverId" />
<result column="server_name" jdbcType="VARCHAR" property="serverName" />
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId" />
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName" />
<result column="exchange_id" jdbcType="VARCHAR" property="exchangeId" />
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName" />
<result column="queue_id" jdbcType="VARCHAR" property="queueId" />
<result column="queue_name" jdbcType="VARCHAR" property="queueName" />
<result column="routing_key_id" jdbcType="VARCHAR" property="routingKeyId" />
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName" />
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime" />
<result column="send_content" jdbcType="BLOB" property="sendContent" />
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, user_id, username, `server_name`, virtual_host_name, exchange_name, routing_key_name,
queue_name, send_time, receive_time, send_content, gmt_create, gmt_modified
id, user_id, username, server_id, `server_name`, virtual_host_id, virtual_host_name,
exchange_id, exchange_name, queue_id, queue_name, routing_key_id, routing_key_name,
send_time, receive_time, send_content, gmt_create, gmt_modified
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List"/>
<include refid="Base_Column_List" />
from message_note
where id = #{id,jdbcType=VARCHAR}
</select>
<!-- 获取，消息收发记录列表 -->
<select id="selectMessageNoteList" parameterType="com.sunyo.wlpt.message.bus.service.domain.MessageNote"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from message_note
<where>
<!-- 所属用户登陆名称 -->
<if test="username != null and username !=''">
username = #{username,jdbcType=VARCHAR}
</if>
<!-- 所属服务器名称 -->
<if test="serverName != null and serverName !=''">
AND server_name = #{serverName,jdbcType=VARCHAR}
</if>
<!-- 所属虚拟主机名称 -->
<if test="virtualHostName != null and virtualHostName !=''">
AND virtual_host_name = #{virtualHostName,jdbcType=VARCHAR}
</if>
<!-- 所属交换机名称 -->
<if test="exchangeName != null and exchangeName !=''">
AND exchange_name = #{exchangeName,jdbcType=VARCHAR}
</if>
<!-- 所属路由键名称 -->
<if test="routingKeyName != null and routingKeyName !=''">
AND routing_key_name = #{routingKeyName,jdbcType=VARCHAR}
</if>
<!-- 所属队列名称 -->
<if test="queueName != null and queueName !=''">
AND queue_name = #{queueName,jdbcType=VARCHAR}
</if>
<!-- 消息发送时间 -->
<if test="sendTime != null">
AND DATE_FORMAT(send_time,'%Y-%m-%d') = #{sendTime,jdbcType=DATE}
</if>
<!-- 消息接收时间 -->
<if test="receiveTime != null">
AND DATE_FORMAT(receive_time,'%Y-%m-%d') = #{receiveTime,jdbcType=DATE}
</if>
</where>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
<!--@mbg.generated-->
delete from message_note
... ... @@ -80,15 +44,19 @@
<insert id="insert" parameterType="com.sunyo.wlpt.message.bus.service.domain.MessageNote">
<!--@mbg.generated-->
insert into message_note (id, user_id, username,
`server_name`, virtual_host_name, exchange_name,
routing_key_name, queue_name, send_time,
receive_time, send_content, gmt_create,
gmt_modified)
server_id, `server_name`, virtual_host_id,
virtual_host_name, exchange_id, exchange_name,
queue_id, queue_name, routing_key_id,
routing_key_name, send_time, receive_time,
send_content, gmt_create, gmt_modified
)
values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
#{serverName,jdbcType=VARCHAR}, #{virtualHostName,jdbcType=VARCHAR}, #{exchangeName,jdbcType=VARCHAR},
#{routingKeyName,jdbcType=VARCHAR}, #{queueName,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP},
#{receiveTime,jdbcType=TIMESTAMP}, #{sendContent,jdbcType=BLOB}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP})
#{serverId,jdbcType=VARCHAR}, #{serverName,jdbcType=VARCHAR}, #{virtualHostId,jdbcType=VARCHAR},
#{virtualHostName,jdbcType=VARCHAR}, #{exchangeId,jdbcType=VARCHAR}, #{exchangeName,jdbcType=VARCHAR},
#{queueId,jdbcType=VARCHAR}, #{queueName,jdbcType=VARCHAR}, #{routingKeyId,jdbcType=VARCHAR},
#{routingKeyName,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, #{receiveTime,jdbcType=TIMESTAMP},
#{sendContent,jdbcType=BLOB}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.MessageNote">
<!--@mbg.generated-->
... ... @@ -103,21 +71,36 @@
<if test="username != null">
username,
</if>
<if test="serverId != null">
server_id,
</if>
<if test="serverName != null">
`server_name`,
</if>
<if test="virtualHostId != null">
virtual_host_id,
</if>
<if test="virtualHostName != null">
virtual_host_name,
</if>
<if test="exchangeId != null">
exchange_id,
</if>
<if test="exchangeName != null">
exchange_name,
</if>
<if test="routingKeyName != null">
routing_key_name,
<if test="queueId != null">
queue_id,
</if>
<if test="queueName != null">
queue_name,
</if>
<if test="routingKeyId != null">
routing_key_id,
</if>
<if test="routingKeyName != null">
routing_key_name,
</if>
<if test="sendTime != null">
send_time,
</if>
... ... @@ -144,21 +127,36 @@
<if test="username != null">
#{username,jdbcType=VARCHAR},
</if>
<if test="serverId != null">
#{serverId,jdbcType=VARCHAR},
</if>
<if test="serverName != null">
#{serverName,jdbcType=VARCHAR},
</if>
<if test="virtualHostId != null">
#{virtualHostId,jdbcType=VARCHAR},
</if>
<if test="virtualHostName != null">
#{virtualHostName,jdbcType=VARCHAR},
</if>
<if test="exchangeId != null">
#{exchangeId,jdbcType=VARCHAR},
</if>
<if test="exchangeName != null">
#{exchangeName,jdbcType=VARCHAR},
</if>
<if test="routingKeyName != null">
#{routingKeyName,jdbcType=VARCHAR},
<if test="queueId != null">
#{queueId,jdbcType=VARCHAR},
</if>
<if test="queueName != null">
#{queueName,jdbcType=VARCHAR},
</if>
<if test="routingKeyId != null">
#{routingKeyId,jdbcType=VARCHAR},
</if>
<if test="routingKeyName != null">
#{routingKeyName,jdbcType=VARCHAR},
</if>
<if test="sendTime != null">
#{sendTime,jdbcType=TIMESTAMP},
</if>
... ... @@ -186,21 +184,36 @@
<if test="username != null">
username = #{username,jdbcType=VARCHAR},
</if>
<if test="serverId != null">
server_id = #{serverId,jdbcType=VARCHAR},
</if>
<if test="serverName != null">
`server_name` = #{serverName,jdbcType=VARCHAR},
</if>
<if test="virtualHostId != null">
virtual_host_id = #{virtualHostId,jdbcType=VARCHAR},
</if>
<if test="virtualHostName != null">
virtual_host_name = #{virtualHostName,jdbcType=VARCHAR},
</if>
<if test="exchangeId != null">
exchange_id = #{exchangeId,jdbcType=VARCHAR},
</if>
<if test="exchangeName != null">
exchange_name = #{exchangeName,jdbcType=VARCHAR},
</if>
<if test="routingKeyName != null">
routing_key_name = #{routingKeyName,jdbcType=VARCHAR},
<if test="queueId != null">
queue_id = #{queueId,jdbcType=VARCHAR},
</if>
<if test="queueName != null">
queue_name = #{queueName,jdbcType=VARCHAR},
</if>
<if test="routingKeyId != null">
routing_key_id = #{routingKeyId,jdbcType=VARCHAR},
</if>
<if test="routingKeyName != null">
routing_key_name = #{routingKeyName,jdbcType=VARCHAR},
</if>
<if test="sendTime != null">
send_time = #{sendTime,jdbcType=TIMESTAMP},
</if>
... ... @@ -224,11 +237,16 @@
update message_note
set user_id = #{userId,jdbcType=VARCHAR},
username = #{username,jdbcType=VARCHAR},
server_id = #{serverId,jdbcType=VARCHAR},
`server_name` = #{serverName,jdbcType=VARCHAR},
virtual_host_id = #{virtualHostId,jdbcType=VARCHAR},
virtual_host_name = #{virtualHostName,jdbcType=VARCHAR},
exchange_id = #{exchangeId,jdbcType=VARCHAR},
exchange_name = #{exchangeName,jdbcType=VARCHAR},
routing_key_name = #{routingKeyName,jdbcType=VARCHAR},
queue_id = #{queueId,jdbcType=VARCHAR},
queue_name = #{queueName,jdbcType=VARCHAR},
routing_key_id = #{routingKeyId,jdbcType=VARCHAR},
routing_key_name = #{routingKeyName,jdbcType=VARCHAR},
send_time = #{sendTime,jdbcType=TIMESTAMP},
receive_time = #{receiveTime,jdbcType=TIMESTAMP},
send_content = #{sendContent,jdbcType=BLOB},
... ... @@ -236,5 +254,45 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
<!-- 获取，消息收发记录列表 -->
<select id="selectMessageNoteList" parameterType="com.sunyo.wlpt.message.bus.service.domain.MessageNote" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from message_note
<where>
<!-- 所属用户登陆名称 -->
<if test="username != null and username !=''">
username = #{username,jdbcType=VARCHAR}
</if>
<!-- 所属服务器名称 -->
<if test="serverName != null and serverName !=''">
AND server_name = #{serverName,jdbcType=VARCHAR}
</if>
<!-- 所属虚拟主机名称 -->
<if test="virtualHostName != null and virtualHostName !=''">
AND virtual_host_name = #{virtualHostName,jdbcType=VARCHAR}
</if>
<!-- 所属交换机名称 -->
<if test="exchangeName != null and exchangeName !=''">
AND exchange_name = #{exchangeName,jdbcType=VARCHAR}
</if>
<!-- 所属路由键名称 -->
<if test="routingKeyName != null and routingKeyName !=''">
AND routing_key_name = #{routingKeyName,jdbcType=VARCHAR}
</if>
<!-- 所属队列名称 -->
<if test="queueName != null and queueName !=''">
AND queue_name = #{queueName,jdbcType=VARCHAR}
</if>
<!-- 消息发送时间 -->
<if test="sendTime != null">
AND DATE_FORMAT(send_time,'%Y-%m-%d') = #{sendTime,jdbcType=DATE}
</if>
<!-- 消息接收时间 -->
<if test="receiveTime != null">
AND DATE_FORMAT(receive_time,'%Y-%m-%d') = #{receiveTime,jdbcType=DATE}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
... ...