From 6357def57472bac8bee88ae82eb67322bf1d96ae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 14 Apr 2020 17:54:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/constant/PartyMemberConstant.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index c0f4565c8a..106ea6c7fa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -109,7 +109,7 @@ public interface PartyMemberConstant { /** * 网格ID */ - String ALL = " all"; + String ALL = "all"; /** * 认证成功 @@ -120,4 +120,9 @@ public interface PartyMemberConstant { * 认证失败 */ String CONFIRM_FAILED = "1"; + + /** + * 居民端 + */ + String RESI = "resi"; } From 7e23b1663953df2ec8dd22ee798d22511c01b1d3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 14 Apr 2020 18:17:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=AF=B9=E8=B1=A1=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E5=AD=98=E5=82=A8=EF=BC=8C=E4=B8=8D=E4=BB=A5?= =?UTF-8?q?hash=E5=AD=98=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/member/redis/ResiGroupMemberRedis.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java index f2305e9b0d..9285e70f54 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java @@ -70,14 +70,15 @@ public class ResiGroupMemberRedis { * @Date 2020.04.13 23:36 **/ public ResiGroupMemberInfoRedisDTO get(String groupId ,String userId){ - - Map map = redisUtils.hGetAll(RedisKeys.getResiGroupMemberInfoKey(groupId,userId)); + /* + Map map = redisUtils.hGetAll(); if (MapUtil.isEmpty(map)) { return null; } //map to bean - ResiGroupMemberInfoRedisDTO member = BeanUtil.mapToBean(map, ResiGroupMemberInfoRedisDTO.class, true); - return member; + ResiGroupMemberInfoRedisDTO member = BeanUtil.mapToBean(map, ResiGroupMemberInfoRedisDTO.class, true);*/ + return (ResiGroupMemberInfoRedisDTO) redisUtils.get(RedisKeys.getResiGroupMemberInfoKey(groupId,userId)); + } /**