小小训练营

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImSendGroupMessage.java

@@ -34,6 +34,9 @@ public class ImSendGroupMessage {
     @ApiModelProperty(value = "文件大小")
     private Long fileSize;
 
+    @ApiModelProperty(value = "消息发送类型即时 NOW、定时发送 TIMING")
+    private String sendType = "TIMING";
+
     @ApiModelProperty(value = "消息类型(IMG,FILE)")
     private ImSendTypeEnum messageType;
 
@@ -50,6 +53,14 @@ public class ImSendGroupMessage {
 
     private Date updateTime;
 
+    public String getSendType() {
+        return sendType;
+    }
+
+    public void setSendType(String sendType) {
+        this.sendType = sendType;
+    }
+
     public String getOperator() {
         return operator;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ImSendGroupMessageQueryInfo.java

@@ -15,6 +15,17 @@ public class ImSendGroupMessageQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "发送人")
     private String senderId;
 
+    @ApiModelProperty(value = "消息发送类型即时 NOW、定时发送 TIMING")
+    private String sendType;
+
+    public String getSendType() {
+        return sendType;
+    }
+
+    public void setSendType(String sendType) {
+        this.sendType = sendType;
+    }
+
     public String getSenderId() {
         return senderId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImSendGroupMessageServiceImpl.java

@@ -10,20 +10,11 @@ import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import net.coobird.thumbnailator.Thumbnails;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,6 +53,7 @@ public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendG
 		messageDto.setSenderId(user.getId().toString());
 		messageDto.setOperator(user.getRealName());
 		if(Objects.isNull(messageDto.getSendTime())){
+			messageDto.setSendType("NOW");
 			messageDto.setSendTime(new Date());
 			messageDto.setSendFlag(true);
 			send(messageDto);

mec-biz/src/main/resources/config/mybatis/ImSendGroupMessageMapper.xml

@@ -16,6 +16,7 @@
 		<result column="file_name_" property="fileName" />
 		<result column="file_size_" property="fileSize" />
 		<result column="message_type_" property="messageType" />
+		<result column="send_type_" property="sendType" />
 		<result column="send_flag_" property="sendFlag" />
 		<result column="send_time_" property="sendTime" />
 		<result column="operator_" property="operator" />
@@ -36,14 +37,17 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImSendGroupMessage" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO im_send_group_message (message_content_,sender_id_,extra,target_ids_,file_url_,file_name_,
-		                                   file_size_,message_type_,send_flag_,send_time_,create_time_,update_time_,operator_)
+		                                   file_size_,message_type_,send_flag_,send_time_,create_time_,update_time_,operator_,send_type_)
 		VALUES(#{messageContent},#{senderId},#{extra},#{targetIds},#{fileUrl},#{fileName},#{fileSize},
-		       #{messageType},#{sendFlag},#{sendTime},NOW(),NOW(),#{operator})
+		       #{messageType},#{sendFlag},#{sendTime},NOW(),NOW(),#{operator},#{sendType})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ImSendGroupMessage">
 		UPDATE im_send_group_message <set>
+			<if test="sendType != null">
+				send_type_ = #{sendType},
+			</if>
 			<if test="operator != null">
 				operator_ = #{operator},
 			</if>
@@ -101,6 +105,9 @@
 			<if test="senderId != null">
 				AND sender_id_ = #{senderId}
 			</if>
+			<if test="sendType != null">
+				AND send_type_ = #{sendType}
+			</if>
 		</where>
 	</sql>