elink-star
/
esua-epdc-cloud
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/active_user'

feature/dangjian
李鹏飞 5 years ago
parent
eb9af98eef e2114f6c9a
commit
462ae99018
4 changed files with 16 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java
  2. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java
  3. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  4. 4
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java
View File

@ -3,8 +3,6 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.async.WxMaSecCheckTask;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
@ -14,7 +12,6 @@ import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
import com.elink.esua.epdc.feign.CommentFeignClient;
import com.elink.esua.epdc.service.CommentService;
import com.elink.esua.epdc.utils.UserTagUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -44,11 +41,11 @@ public class CommentServiceImpl implements CommentService {
commentFormDTO.setUserFace(userDetail.getFaceImg());
commentFormDTO.setDeptId(userDetail.getGridId());
SubmitCommentFormDTO submitCommentFormDTO = ConvertUtils.sourceToTarget(commentFormDTO, SubmitCommentFormDTO.class);
if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
} else {
submitCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value());
}
// if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
// submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
// } else {
// submitCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value());
// }
return commentFeignClient.submit(submitCommentFormDTO);
}

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java
View File

@ -3,8 +3,6 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.async.WxMaSecCheckTask;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
@ -12,7 +10,6 @@ import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
import com.elink.esua.epdc.feign.TopicCommentFeignClient;
import com.elink.esua.epdc.service.TopicCommentService;
import com.elink.esua.epdc.utils.UserTagUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -41,11 +38,11 @@ public class TopicCommentServiceImpl implements TopicCommentService {
topicCommentFormDTO.setUserName(userDetail.getNickname());
topicCommentFormDTO.setUserFace(userDetail.getFaceImg());
topicCommentFormDTO.setDeptId(userDetail.getGridId());
if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
} else {
topicCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value());
}
// if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
// topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
// } else {
// topicCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value());
// }
return topicCommentFeignClient.submit(topicCommentFormDTO);
}

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
View File

@ -165,9 +165,11 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
List<String> textList = new ArrayList<>();
textList.add(commentFormDTO.getContent());
String mobile = null;
String partyFlag = "";
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(commentFormDTO.getUserId());
if(null != user.getData()){
mobile = user.getData().getMobile();
partyFlag = user.getData().getPartyFlag();
}
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(commentFormDTO.getDeptId()).getData();
@ -190,7 +192,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
commentEntity.setUserId(commentFormDTO.getUserId());
commentEntity.setUserName(commentFormDTO.getUserName());
commentEntity.setUserFace(commentFormDTO.getUserFace());
commentEntity.setPartyFlag(commentFormDTO.getPartyFlag());
commentEntity.setPartyFlag(partyFlag);
boolean isIssue = true;
boolean isComment = true;

4
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
View File

@ -146,9 +146,11 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
List<String> textList = new ArrayList<>();
textList.add(commentFormDTO.getContent());
String mobile = null;
String partyFlag = "";
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(commentFormDTO.getUserId());
if(null != user.getData()){
mobile = user.getData().getMobile();
partyFlag = user.getData().getPartyFlag();
}
// 获取所有上级机构名称和ID拼接
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(commentFormDTO.getDeptId()).getData();
@ -169,7 +171,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
commentEntity.setUsername(commentFormDTO.getUserName());
commentEntity.setUserFace(commentFormDTO.getUserFace());
commentEntity.setTopicId(commentFormDTO.getTopicId());
commentEntity.setPartyFlag(commentFormDTO.getPartyFlag());
commentEntity.setPartyFlag(partyFlag);
boolean isComment = true;
// 评论类型 0-评论

Write Preview
Loading…
Cancel
Save