diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java new file mode 100644 index 0000000000..0f8f937a8a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java @@ -0,0 +1,20 @@ +package com.epmet.commons.tools.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.fallback.CommonUserFeignClientFallBackFactory; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:42 下午 + * @DESC + */ +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = CommonUserFeignClientFallBackFactory.class) +public interface CommonUserFeignClient { + @PostMapping("/epmetuser/userbaseinfo/getUserInfo/{userId}") + Result getUserInfo(@PathVariable("userId") String userId); +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java new file mode 100644 index 0000000000..269ee6d985 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java @@ -0,0 +1,24 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:46 下午 + * @DESC + */ +@Slf4j +@Component +public class CommonUserFeignClientFallBackFactory implements FallbackFactory { + private CommonUserFeignClientFallback fallback = new CommonUserFeignClientFallback(); + @Override + public CommonUserFeignClient create(Throwable cause) { + log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); + return fallback; + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java new file mode 100644 index 0000000000..8cd5660484 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import org.springframework.stereotype.Component; + +/** + * 调用政府端权限 + * @Author zqf + * @Description + * @Date 2020/4/24 11:17 + **/ +@Component +public class CommonUserFeignClientFallback implements CommonUserFeignClient { + + @Override + public Result getUserInfo(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserInfo", userId); + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java new file mode 100644 index 0000000000..5b34fcdee7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java @@ -0,0 +1,90 @@ +package com.epmet.commons.tools.redis.common; + +import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.Map; + +/** + * 居民缓存通用类 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Slf4j +@Component +public class CustomerResiUserRedis { + @Resource + private RedisUtils redisUtils; + @Resource + private CommonUserFeignClient commonUserFeignClient; + + private static CustomerResiUserRedis customerResiUserRedis; + private static final String ROLE_MAP_KEY = "roleMap"; + + @PostConstruct + public void init() { + customerResiUserRedis = this; + customerResiUserRedis.redisUtils = this.redisUtils; + customerResiUserRedis.commonUserFeignClient = this.commonUserFeignClient; + } + + /** + * desc: 获取居民缓存 + * + * @param userId + * @return com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache + * @author LiuJanJun + * @date 2021/8/19 10:29 下午 + * @remark 此方法仅用于 获取某个工作人员的信息，不用于获取客户下所有工作人员信息 + */ + public static ResiUserInfoCache getUserBaseInfo(String userId) { + if (StringUtils.isBlank(userId)){ + log.warn("getUserBaseInfo param is blank,userId:{}",userId); + return null; + } + String key = RedisKeys.getResiUserKey(userId); + Map map = customerResiUserRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(map)) { + return ConvertUtils.mapToEntity(map, ResiUserInfoCache.class); + } + + ResiUserInfoCache resultData = reloadStaffCache(userId, key); + if (resultData == null) { + return null; + } + + return resultData; + } + + @Nullable + private static ResiUserInfoCache reloadStaffCache(String userId, String key) { + Result result = customerResiUserRedis.commonUserFeignClient.getUserInfo(userId); + if (result == null || !result.success()) { + throw new RenException("获取居民信息失败"); + } + ResiUserInfoCache resultData = result.getData(); + if (null == resultData) { + log.warn("居民信息为空,userId:{}", userId); + return null; + } + + Map map = BeanUtil.beanToMap(resultData, false, true); + customerResiUserRedis.redisUtils.hMSet(key, map); + return resultData; + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index 1d201149f4..b6d1f518a1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -11,10 +11,14 @@ package com.epmet.commons.tools.security.config; import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver; import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver; import com.epmet.commons.tools.utils.DateUtils; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -27,9 +31,10 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.io.IOException; +import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.List; -import java.util.TimeZone; +import java.util.*; /** * MVC配置 @@ -43,6 +48,7 @@ public class WebMvcConfig implements WebMvcConfigurer { private UserDetailHandlerMethodArgumentResolver userDetailHandlerMethodArgumentResolver; @Autowired private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; + @Override public void addArgumentResolvers(List argumentResolvers) { argumentResolvers.add(loginUserHandlerMethodArgumentResolver); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index a1e6a233d0..2ee065b4b5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -4,7 +4,7 @@ + SELECT + TITLE, + STATEMENT AS remark, + IF(POINT_VALUE > 0,concat( '+', POINT_VALUE ),POINT_VALUE) AS point, + BUSINESS_ID, + BUSINESS_CODE, + DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date, + DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time + FROM + point_additive_record + WHERE + DEL_FLAG = '0' + AND SUBJECT_ID = #{subjectId} + AND CUSTOMER_ID = #{customerId} + AND CATEGORY_CODE = #{categoryCode} + ORDER BY + CREATED_TIME DESC + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml new file mode 100644 index 0000000000..84a26d63e7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml deleted file mode 100644 index 4839dd26fa..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 6daa8936d8..4eff87f9b8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -37,5 +37,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml new file mode 100644 index 0000000000..98f794dcea --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml similarity index 62% rename from epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml rename to epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml index c015362019..e0fb760bd7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml @@ -1,15 +1,13 @@ - + - + - - - - + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java index b98e4489bd..04a34bb814 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java @@ -31,8 +31,9 @@ public class CollectListExcelResultDTO implements Serializable { /** * 房屋类型，1:自有, 0:租住 + * 房屋状态1：出租 0：自住 2：闲置 3：未售出 */ - @Excel(name = "房屋类型",replace = { "自有_1", "租住_0"}, width = 30, needMerge = true) + @Excel(name = "房屋状态",replace = { "出租_1", "自住_0","闲置_2","未售出_3"}, width = 30, needMerge = true) private String houseType; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 34efe5d146..85208ba924 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -56,4 +56,10 @@ public class CollectListMemberExcelResultDTO implements Serializable { */ @Excel(name = "单位或学校", width = 60) private String workPlace; + + /** + * 备注 + */ + @Excel(name = "备注", width = 60) + private String remark; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index adc98f7a08..a60efed8cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -19,6 +19,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -215,5 +216,10 @@ public class UserBaseInfoController { public Result resiRelationInfo(@RequestParam("userId")String userId){ return new Result().ok(userBaseInfoService.resiRelationInfo(userId)); } + + @PostMapping("getUserInfo/{userId}") + public Result getUserInfo(@PathVariable("userId") String userId){ + return new Result().ok(userBaseInfoService.getUserInfo(userId)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index f877b1e50b..725a456b46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -127,7 +127,9 @@ public interface CustomerStaffDao extends BaseDao { * @Author sun * @Description 根据staffId集合查询工作人员基础信息 **/ - List selectStaffByIds(@Param("staffIdList") List staffIdList); + List selectStaffByIds(@Param("staffIdList") List staffIdList, + @Param("enableFlag") String enableFlag); + /** * @param staffId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 01bac74fc2..f66453c243 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -19,6 +19,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.UserBaseInfoDTO; @@ -203,4 +204,13 @@ public interface UserBaseInfoService extends BaseService { * @date 2021/12/30 3:12 下午 */ RegisterRelationDTO resiRelationInfo(String userId); + + /** + * 获取用户缓存信息 + * @Param userId + * @Return {@link UserBaseInfoResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/15 16:09 + */ + ResiUserInfoCache getUserInfo(String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 3b836920e9..024d3aed37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.constant.*; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -505,7 +502,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList) { //1:批量查询人员基本信息 - List staffList = baseDao.selectStaffByIds(staffIdList); + List staffList = baseDao.selectStaffByIds(staffIdList, null); //2:批量查询人员拥有的所有角色信息 List roleList = staffRoleDao.selectStaffRoleList(staffIdList); CustomerStaffListResultDTO list = new CustomerStaffListResultDTO(); @@ -640,7 +637,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl>().ok(listResultDTO); } + @Override public Result selectStaffBasicInfo(String userId, String customerId) { StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId); @@ -777,6 +774,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList()); staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - List list = baseDao.selectStaffByIds(staffIdList); + List list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //4.封装数据并返回 resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index a808b172e7..f36dffda3f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -81,6 +81,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId()); userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); } + if (null == userBadge){ + return new ArrayList<>(); + } List redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class); List userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO); if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ @@ -116,6 +119,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List selectOperList(UserOperListFormDTO userOperListFormDTO) { List userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId()); Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId()); + if (null == userBadge){ + return new ArrayList<>(); + } List userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class); // 没有任何记录 if (CollectionUtils.isEmpty(userAuthBadgeList)){ @@ -402,11 +408,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { public void reloadCustomerBadge(String customerId){ userBadgeRedis.delCustomerBadge(customerId); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId); - if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ - throw new RenException("客户徽章缓存初始化未查到数据"); + if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){ + userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } userBadgeRedis.batchClearUserBadgeCache(customerId); - userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 898a7735d2..5970d78788 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.*; @@ -504,4 +505,18 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl + and ENABLE_FLAG = #{enableFlag} + user_id = #{userId}