发送事件修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -227,7 +227,8 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
+			httppost.addHeader(HEADER_CONTENT_TYPE, "application/json");
+			//httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (StringUtils.isNotEmpty(jsonStrParam)) {
 				StringEntity se = new StringEntity(jsonStrParam, UTF8);
 				httppost.setEntity(se);

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.EventClassDto;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.MqReturnBaseResult;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.enums.MqMethodPathEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ValidateException;
@@ -109,6 +110,4 @@ public class SendMqMsgUtils {
 			return new Result<List<EventClassDto>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
 	}
-
-
 }

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

@@ -121,8 +121,8 @@ public class IssueShareLinkRecordController {
      * @date 2020.12.22 10:53
      */
     @PostMapping("sharelinkinfo")
-    public Result<IssueShareLinkRecordDTO> shareLinkInfo(@RequestParam String shareLinkId){
+    public Result<IssueShareLinkRecordDTO> shareLinkInfo(@RequestParam String shareLinkId,@LoginUser TokenDto token){
-        return null;
+        return new Result<IssueShareLinkRecordDTO>().ok(issueShareLinkRecordService.getShareLinkInfoAndUpdate(shareLinkId,token));
     }
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkRecordDao.java

@@ -22,6 +22,7 @@ import com.epmet.entity.IssueShareLinkRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+
 /**
  * 议题分享链接表
  *
@@ -47,5 +48,4 @@ public interface IssueShareLinkRecordDao extends BaseDao<IssueShareLinkRecordEnt
      * @date 2020/12/18 下午1:55
      */
     IssueShareLinkRecordEntity selectIssueInfoById(@Param("issueId") String issueId);
-
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkVisitRecordDao.java

@@ -62,4 +62,6 @@ public interface IssueShareLinkVisitRecordDao extends BaseDao<IssueShareLinkVisi
      * @date 2020.12.22 09:53
     */
     IssueShareLinkVisitRecordDTO selectRecordByLinkIdAndInvitee(@Param("linkId") String linkId, @Param("invitee") String invitee);
+
+    int updateIfJoinGroupByLinkId(@Param("linkId") String linkId, @Param("invitee") String invitee);
 }

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

@@ -115,4 +115,13 @@ public interface IssueShareLinkRecordService extends BaseService<IssueShareLinkR
      * @date 2020/12/18 下午5:22
      */
     IssueVisitResultDTO issueVisit( IssueVisitFormDTO formDTO, TokenDto tokenDto);
+
+    /**
+     * @Description 查询分享链接并修改是否通过该邀请进群属性
+     * @param shareLinkId
+     * @return com.epmet.dto.IssueShareLinkRecordDTO
+     * @author wangc
+     * @date 2020.12.23 15:10
+    */
+    IssueShareLinkRecordDTO getShareLinkInfoAndUpdate(String shareLinkId,TokenDto token);
 }

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

@@ -164,4 +164,17 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
         return new IssueVisitResultDTO(linkRecord.getIssueId(),linkRecord.getGridId(),linkRecord.getCustomerId());
     }
 
+    /**
+     * @Description 查询分享链接并修改是否通过该邀请进群属性
+     * @param shareLinkId
+     * @return com.epmet.dto.IssueShareLinkRecordDTO
+     * @author wangc
+     * @date 2020.12.23 15:10
+     */
+    @Override
+    public IssueShareLinkRecordDTO getShareLinkInfoAndUpdate(String shareLinkId,TokenDto token) {
+        visitRecordDao.updateIfJoinGroupByLinkId(shareLinkId,token.getUserId());
+        return get(shareLinkId);
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueShareLinkVisitRecordDao.xml

@@ -44,4 +44,17 @@
             invitee_user_id  =  #{invitee}
         LIMIT 1
     </select>
+
+    <update id="updateIfJoinGroupByLinkId">
+        UPDATE
+            issue_share_link_visit_record
+        SET
+            if_join_group = 1
+        WHERE
+            del_flag = '0'
+        AND
+            share_link_rec_id = #{linkId}
+        AND
+            invitee_user_id = #{invitee}
+    </update>
 </mapper>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@@ -307,10 +307,6 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
                 log.error("【{}】该用户入组方式为议题分享链接入组，但未查询到链接访问记录，链接Id【{}】",param.getUserId(),param.getShareLinkId());
                 throw new RenException("未找到链接访问记录");
             }
-            if(!visitRecordResult.getData().getIfJoinGroup()){
-                log.error("【{}】该用户入组方式为议题分享链接入组，但并不是通过该链接发起的入群申请，链接Id【{}】",param.getUserId(),param.getShareLinkId());
-                throw new RenException("用户并非通过当前链接申请入组");
-            }
             if(NumConstant.ZERO == visitRecordResult.getData().getIsInviteRegister()) isNew = true;
         }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -430,6 +430,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 22:07
 	 **/
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
 		//1、当前申请单是否是待审核