注释修改

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java

@@ -115,6 +115,14 @@ public class IssueAuditController {
         return new Result<List<ApplicationHistoryWorkResultDTO>>().ok(issueApplicationHistoryService.applicationHistoryWork(applicationHistoryWorkFormDTO));
     }
 
+    /**
+     * @Description 工作端议题审核
+     * @param token
+     * @param param
+     * @return java.lang.String
+     * @author wangc
+     * @date 2021.03.19 23:40
+     */
     @PostMapping("audit")
     public Result<String> audit(@LoginUser TokenDto token, @RequestBody IssueAuditionFormDTO param){
         return new Result<String>().ok(issueService.audit(token,param));

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -152,7 +152,14 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @date 2020.11.19 10:02
     */
     FirstTopicShiftedToIssueApplicationResultDTO topicShiftedToIssueV2(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO);
-
+    /**
+     * @Description 工作端议题审核
+     * @param token
+     * @param param
+     * @return java.lang.String
+     * @author wangc
+     * @date 2021.03.19 23:40
+    */
     String audit(TokenDto token, IssueAuditionFormDTO param);
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -443,6 +443,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return result;
     }
 
+    /**
+     * @Description 工作端议题审核
+     * @param token
+     * @param param
+     * @return java.lang.String
+     * @author wangc
+     * @date 2021.03.19 23:40
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String audit(TokenDto token, IssueAuditionFormDTO param){

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java

@@ -51,7 +51,7 @@ public class ResiGroupMemberInfoRedisDTO implements Serializable {
      * */
     private String memberMobile;
   /**
-     * 组Id，不存在redis的value中，存在redis的key中
+     * 组Id
      * */
     private String groupId;
 
@@ -64,7 +64,8 @@ public class ResiGroupMemberInfoRedisDTO implements Serializable {
          "userShowName": "山东路-尹女士",
          "groupLeaderFlag": "leader",
          "enterGroupType": "created",
-         "memberStatus": "approved"
+         "memberStatus": "approved",
+         "groupId":"***"
         }
      *
      *

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java

@@ -85,7 +85,7 @@ public class ResiGroupMemberRedis {
     }
 
     /**
-     * @Description 得到一个指定组内成员信息,如果redis中没有，则返回null
+     * @Description 得到一个指定组内成员信息,如果redis中没有，则去数据库查询并放入缓存
      * @Param groupId
      * @Param userId
      * @return ResiGroupMemberInfoRedisDTO.class
@@ -97,7 +97,7 @@ public class ResiGroupMemberRedis {
         ResiGroupMemberInfoRedisDTO memberCache =
         (ResiGroupMemberInfoRedisDTO) redisUtils.get(ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId,userId));
         //如果缓存中没有该成员数据
-        if(null == memberCache || StringUtils.isNotBlank(memberCache.getUserId())){
+        if(null == memberCache || StringUtils.isBlank(memberCache.getUserId())){
             Map<String,Object> param = new HashMap<>();
             param.put(TopicConstant.CUSTOMER_USER_ID,userId);
             param.put(TopicConstant.RESI_GROUP_ID,groupId);
@@ -140,7 +140,6 @@ public class ResiGroupMemberRedis {
                         .concat(userId));
             }
         }
-        memberCache.setGroupId(groupId);
         return memberCache;
 
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@@ -202,6 +202,16 @@ public class UserResiInfoController {
         return new Result();
     }
 
+    /**
+     * @Description 在分享链接之后完成注册居民之后调用的接口
+     * 作用
+     *
+     * 			更改邀请浏览记录里"是否通过邀请链接注册居民"
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.18 16:34
+     */
     @PostMapping("submitinlink")
     public Result submitInLink(@RequestBody AfterRegisterResidentInSharableLinkFormDTO param, @LoginUser TokenDto token){
         param.setInviteeId(token.getUserId());