diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index 52ae3bb..2175a38 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -71,4 +71,6 @@ public class MaterialConstants { /** 文件类型:合同照片 */ public static final Integer APPENDICES_OF_CONTRACT = 20; //move to TmTaskTypeEnum + public static final String CACHE_MATERIAL_MALL_MESSAGE_CODE = "material-mall-message-code:"; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java index 2d7c180..5d36b89 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java @@ -27,6 +27,21 @@ public class BmMessage extends BaseEntity { @ApiModelProperty(value = "uuid") private String uuid; + /** 消息类型 */ + @Excel(name = "消息类型") + @ApiModelProperty(value = "消息类型") + private String messageType; + + /** 消息主题 */ + @Excel(name = "消息主题") + @ApiModelProperty(value = "消息主题") + private String messageTopic; + + /** 消息内容 */ + @Excel(name = "消息内容") + @ApiModelProperty(value = "消息内容") + private String messageContent; + /** 来自userId */ @Excel(name = "来自userId") @ApiModelProperty(value = "来自userId") @@ -46,16 +61,4 @@ public class BmMessage extends BaseEntity { @Excel(name = "发给companyId") @ApiModelProperty(value = "发给companyId") private String toCompany; - - /** 消息内容 */ - @Excel(name = "消息内容") - @ApiModelProperty(value = "消息内容") - private String messageContent; - - /** 消息类型 */ - @Excel(name = "消息类型") - @ApiModelProperty(value = "消息类型") - private String messageType; - - } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index 39e6dc0..07f7cfb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -1,14 +1,24 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.core.constant.CacheConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.redis.service.RedisService; +import com.bonus.common.security.config.VerificationCodeConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmMessageMapper; import com.bonus.material.basic.domain.BmMessage; import com.bonus.material.basic.service.IBmMessageService; +import javax.annotation.Resource; + /** * 【请填写功能名称】Service业务层处理 * @@ -20,6 +30,12 @@ public class BmMessageServiceImpl implements IBmMessageService { @Autowired private BmMessageMapper bmMessageMapper; + @Resource + private VerificationCodeConfig verificationCodeConfig; + + @Resource + private RedisService redisService; + /** * 查询【请填写功能名称】 * @@ -52,6 +68,9 @@ public class BmMessageServiceImpl implements IBmMessageService { public int insertBmMessage(BmMessage bmMessage) { bmMessage.setCreateTime(DateUtils.getNowDate()); try { + String uuid = String.valueOf(UUID.randomUUID()); + String verifyKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE + StringUtils.nvl(uuid + "_" + bmMessage.getMessageTopic(), ""); + redisService.setCacheObject(verifyKey, uuid, verificationCodeConfig.getTime(), TimeUnit.MINUTES); return bmMessageMapper.insertBmMessage(bmMessage); } catch (Exception e) { throw new ServiceException("错误信息描述"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml index d8100ce..dc559ff 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml @@ -10,14 +10,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + - select id, uuid, from_user, to_user, from_company, to_company, message_content, message_type, create_time, update_time from bm_message + select id, uuid, from_user, to_user, from_company, to_company, message_content, message_topic, message_type, create_time, update_time from bm_message @@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from_company, to_company, message_content, + message_topic, message_type, create_time, update_time, @@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{fromCompany}, #{toCompany}, #{messageContent}, + #{messageTopic}, #{messageType}, #{createTime}, #{updateTime}, @@ -73,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from_company = #{fromCompany}, to_company = #{toCompany}, message_content = #{messageContent}, + message_topic = #{messageTopic}, message_type = #{messageType}, create_time = #{createTime}, update_time = #{updateTime},