From 55092ce72c010355db372673d7dec352fab52bd7 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 20 Dec 2024 15:10:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/constant/MaterialConstants.java | 3 ++- .../material/basic/service/impl/BmMessageServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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 2175a38..875f30e 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,6 +71,7 @@ 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:"; + public static final String CACHE_MATERIAL_MALL_MESSAGE = "material-mall-message:"; + public static final Long CACHE_MATERIAL_MALL_MESSAGE_HOURS = 24L; } 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 7879473..c29e544 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 @@ -52,7 +52,7 @@ public class BmMessageServiceImpl implements IBmMessageService { @Override public List selectBmMessageListFromCache(BmMessage bmMessage) { - List bmMessages = redisService.getCacheList(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE); + List bmMessages = redisService.getCacheList(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE); return bmMessages; } @@ -69,9 +69,9 @@ public class BmMessageServiceImpl implements IBmMessageService { bmMessage.setFromCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmMessage.setFromUser(SecurityUtils.getLoginUser().getSysUser().getUserId()); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); - String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE; + String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE; String msgContent = JSONObject.toJSONString(bmMessage); - redisService.setCacheObject(msgKey, msgContent, verificationCodeConfig.getTime(), TimeUnit.MINUTES); + redisService.setCacheObject(msgKey, msgContent, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS); return bmMessageMapper.insertBmMessage(bmMessage); } catch (Exception e) { throw new ServiceException("错误信息描述"); From 6e24bf119404c9ad54125d56191f04892b0189ac Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 20 Dec 2024 15:15:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/impl/BmMessageServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 c29e544..d4250e0 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 @@ -3,6 +3,8 @@ package com.bonus.material.basic.service.impl; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + import com.alibaba.fastjson2.JSONObject; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.core.exception.ServiceException; @@ -47,13 +49,18 @@ public class BmMessageServiceImpl implements IBmMessageService { */ @Override public List selectBmMessageList(BmMessage bmMessage) { + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + bmMessage.setFromCompany(companyId); + bmMessage.setToCompany(companyId); return bmMessageMapper.selectBmMessageList(bmMessage); } @Override public List selectBmMessageListFromCache(BmMessage bmMessage) { List bmMessages = redisService.getCacheList(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE); - return bmMessages; + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + List result = bmMessages.stream().filter(o -> companyId.equals(o.getFromCompany()) || companyId.equals(o.getToCompany())).collect(Collectors.toList()); + return result; } /** From c01dc598ccc10cc954c17ed183607a44b4878ed4 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 20 Dec 2024 15:21:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/service/impl/BmMessageServiceImpl.java | 5 ----- .../resources/mapper/material/basic/BmMessageMapper.xml | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) 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 d4250e0..5353dad 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 @@ -4,13 +4,11 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import com.alibaba.fastjson2.JSONObject; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.redis.service.RedisService; -import com.bonus.common.security.config.VerificationCodeConfig; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,9 +22,6 @@ public class BmMessageServiceImpl implements IBmMessageService { @Autowired private BmMessageMapper bmMessageMapper; - @Resource - private VerificationCodeConfig verificationCodeConfig; - @Resource private RedisService redisService; 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 dc559ff..ef695c3 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 @@ -25,10 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and uuid = #{uuid} - and from_user = #{fromUser} - and to_user = #{toUser} - and from_company = #{fromCompany} - and to_company = #{toCompany} + and (from_user = #{fromUser} or to_user = #{toUser}) + and (from_company = #{fromCompany} or to_company = #{toCompany}) and message_content = #{messageContent} and message_topic = #{messageTopic} and message_type = #{messageType}