From 6f999b3dd0c399433b59f24f2c6aeea72b2400b3 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Sat, 9 May 2020 14:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=9F=8B=E7=82=B9=20redis=20?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/result/PointsRuleResultDTO.java | 44 ++----------------- .../elink/esua/epdc/dao/PointsRuleDao.java | 4 +- .../esua/epdc/mq/PointsModifyConsumer.java | 10 +---- .../service/impl/PointsRuleServiceImpl.java | 9 +--- .../main/resources/mapper/PointsRuleDao.xml | 13 ++++-- 5 files changed, 16 insertions(+), 64 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java index 63bf7e4e..95ebc6cd 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -34,10 +33,6 @@ public class PointsRuleResultDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * ID - */ - private String id; /** * 积分规则编码 @@ -49,6 +44,10 @@ public class PointsRuleResultDTO implements Serializable { */ private String behaviorCode; + /** + * 动作描述 + */ + private String behaviorDesc; /** * 积分规则描述 */ @@ -84,41 +83,6 @@ public class PointsRuleResultDTO implements Serializable { */ private String addedVal; - /** - * 备注 - */ - private String remark; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0-否，1-是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - /** * 动作上限次数0-不限 1-一次 .... */ diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java index cbd35e1f..167f8b1e 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java @@ -19,8 +19,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PointsRuleDTO; -import com.elink.esua.epdc.dto.result.BehaviorResultDto; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; import com.elink.esua.epdc.entity.PointsRuleEntity; import org.apache.ibatis.annotations.Mapper; @@ -44,7 +42,7 @@ public interface PointsRuleDao extends BaseDao { * @Date 2020/4/29 * @Param [behaviorCode] **/ - PointsRuleEntity selecOnePointsRuleByBehaviorCode(String behaviorCode); + PointsRuleResultDTO selecOnePointsRuleByBehaviorCode(String behaviorCode); /** * 积分规则配置 列表查询 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java index 276e8fe8..a76e8e1b 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java @@ -3,29 +3,20 @@ package com.elink.esua.epdc.mq; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; -import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; -import com.elink.esua.epdc.commons.tools.exception.ErrorCode; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.form.PointsLogsAddFormDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; -import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO; import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import com.elink.esua.epdc.feign.UsersFeignClient; import com.elink.esua.epdc.jwt.JwtTokenProperties; -import com.elink.esua.epdc.jwt.JwtTokenUtils; import com.elink.esua.epdc.mq.dto.BehaviorDto; -import com.elink.esua.epdc.service.PointsBehaviorService; import com.elink.esua.epdc.service.PointsLogsService; import com.elink.esua.epdc.service.PointsRuleService; -import io.jsonwebtoken.Claims; -import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.message.MessageExt; @@ -165,6 +156,7 @@ public class PointsModifyConsumer implements RocketMQListener { //4.更新redis用户积分情况 TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class); tokenDto.setUserId(userDTO.getId()); + tokenDto.setGridId(userDTO.getDeptId()); int expire = jwtTokenProperties.getExpire(); cpUserDetailRedis.set(tokenDto, expire); //更新用户的积分 -- 结束 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java index cdafb109..d2e3594a 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java @@ -30,13 +30,8 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.PointsRuleDao; import com.elink.esua.epdc.dto.PointsRuleDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.BehaviorResultDto; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; import com.elink.esua.epdc.entity.PointsRuleEntity; import com.elink.esua.epdc.redis.PointsRuleRedis; @@ -171,9 +166,7 @@ public class PointsRuleServiceImpl extends BaseServiceImpl - + select epr.RULE_CODE,epb.BEHAVIOR_CODE,epr.RULE_DESC,epr.OPERATION_TYPE,epr.POINTS,epr.LIMIT_TYPE,epr.UPPER_LIMIT_VAL + ,epr.ENABLE_FLAG,epr.ADDED_VAL,epr.LIMIT_NUM,epb.BEHAVIOR_DESC + from epdc_points_behavior_rule epbr + left join epdc_points_behavior epb on epb.ID = epbr.BEHAVIOR_ID + left join epdc_points_rule epr on epr.ID = epbr.RULE_ID + where epbr.DEL_FLAG='0' and epb.DEL_FLAG='0' and epr.DEL_FLAG='0' and epr.ENABLE_FLAG = '1' and epb.BEHAVIOR_CODE = #{behaviorCode} + order by epbr.CREATED_TIME desc + limit 1;