update短信推送修改

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

@@ -28,6 +28,16 @@ public class SysMessageConfig {
 	
 	private String group;
 
+	private Integer sendFlag;
+
+	public Integer getSendFlag() {
+		return sendFlag;
+	}
+
+	public void setSendFlag(Integer sendFlag) {
+		this.sendFlag = sendFlag;
+	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}

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

@@ -67,7 +67,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	/**
 	 * 添加消息
-	 * @param userId 用户编号
 	 * @param subject 消息主题
 	 * @param content 消息内容
 	 * @param receivers 接收人，多个人用逗号分开
@@ -136,6 +135,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(messageType);
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
+		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
+			return true;
 		}
 		Date date = new Date();
 		SendStatusEnum status = SendStatusEnum.SUCCESSED;
@@ -219,6 +220,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
+		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
+			return;
 		}
 		Date date = new Date();
 		SendStatusEnum status = SendStatusEnum.WAIT;

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

@@ -13,6 +13,7 @@
 		<result column="modify_on_" property="modifyOn" />
 		<result column="url_" property="url" />
 		<result column="group_" property="group" />
+		<result column="send_flag_" property="sendFlag" />
 	</resultMap>
 
 	<sql id="queryCondition">
@@ -30,6 +31,9 @@
 			<if test="group != null">
 				and group_ = #{group,jdbcType=VARCHAR}
 			</if>
+			<if test="sendFlag != null">
+				and send_flag_ = #{sendFlag}
+			</if>
 		</where>
 	</sql>
 
@@ -80,6 +84,9 @@
 			<if test="description != null">
 				description_ = #{description},
 			</if>
+			<if test="sendFlag != null">
+				send_flag_ = #{sendFlag}
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>