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

修改测试bug

dev
liuchuang 6 years ago
parent
65fffbef51
commit
eaf9e4771f
30 changed files with 175 additions and 120 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. 4
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  2. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  3. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java
  5. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java
  6. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java
  7. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java
  8. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java
  9. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java
  10. 12
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java
  11. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java
  12. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
  13. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  14. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
  15. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  16. 5
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java
  17. 5
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java
  18. 10
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java
  19. 23
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java
  20. 21
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java
  21. 1
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
  22. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
  23. 12
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
  24. 11
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/AppTopicController.java
  25. 8
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java
  26. 30
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
  27. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml
  28. 3
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml
  29. 16
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
  30. 31
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml

4
esua-epdc/epdc-admin/epdc-admin-server/pom.xml
View File

@ -174,8 +174,8 @@
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
</properties>
</profile>
</profiles>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
View File

@ -236,8 +236,8 @@
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
</properties>
</profile>
</profiles>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java
View File

@ -53,8 +53,8 @@ public class ApiGroupController {
* @since 2019/10/21 9:51
*/
@PostMapping("disband")
public Result disbandGroup(@RequestBody GroupSettingStateDTO formDto) {
return groupService.disbandGroup(formDto);
public Result disbandGroup(@LoginUser TokenDto userDetail, @RequestBody GroupSettingStateDTO formDto) {
return groupService.disbandGroup(userDetail, formDto);
}
/**

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java
View File

@ -87,8 +87,8 @@ public class ApiTopicController {
* @since 2019/11/7 15:37
*/
@GetMapping("detail/{id}")
public Result<TopicDetailResultDTO> detail(@PathVariable("id") String id) {
return topicService.getTopicDetailById(id);
public Result<TopicDetailResultDTO> detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) {
return topicService.getTopicDetailById(userDetail, id);
}
/**

9
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java
View File

@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
import com.elink.esua.epdc.feign.fallback.TopicFeignClientFallback;
@ -49,8 +46,8 @@ public interface TopicFeignClient {
* @author liuchuang
* @since 2019/11/7 15:37
*/
@GetMapping(value = "group/epdc-app/topic/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<TopicDetailResultDTO> detail(@PathVariable("id") String id);
@GetMapping(value = "group/epdc-app/topic/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<TopicDetailResultDTO> detail(TopicDetailFormDTO formDto);
/**
*

9
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java
View File

@ -4,10 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
import com.elink.esua.epdc.feign.TopicFeignClient;
@ -29,8 +26,8 @@ public class TopicFeignClientFallback implements TopicFeignClient {
}
@Override
public Result<TopicDetailResultDTO> detail(String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", id);
public Result<TopicDetailResultDTO> detail(TopicDetailFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto);
}
@Override

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java
View File

@ -39,7 +39,7 @@ public interface GroupService {
* @author liuchuang
* @since 2019/10/21 9:51
*/
Result disbandGroup(GroupSettingStateDTO dto);
Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto);
/**
*

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java
View File

@ -42,7 +42,7 @@ public interface TopicService {
* @author liuchuang
* @since 2019/11/7 15:34
*/
Result<TopicDetailResultDTO> getTopicDetailById(String id);
Result<TopicDetailResultDTO> getTopicDetailById(TokenDto userDetail, String id);
/**
*

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

@ -75,8 +75,12 @@ public class GroupServiceImpl implements GroupService {
}
@Override
public Result disbandGroup(GroupSettingStateDTO dto) {
public Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto) {
if (null == userDetail) {
return new Result().error("获取用户信息失败");
}
dto.setState(GroupStateEnum.GROUP_STATE_DISBANDED.getValue());
dto.setUserId(userDetail.getUserId());
return groupFeignClient.disbandGroup(dto);
}

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

@ -66,8 +66,14 @@ public class TopicServiceImpl implements TopicService {
}
@Override
public Result<TopicDetailResultDTO> getTopicDetailById(String id) {
return topicFeignClient.detail(id);
public Result<TopicDetailResultDTO> getTopicDetailById(TokenDto userDetail, String id) {
if (null == userDetail) {
return new Result().error("获取用户信息失败");
}
TopicDetailFormDTO formDto = new TopicDetailFormDTO();
formDto.setId(id);
formDto.setUserId(userDetail.getUserId());
return topicFeignClient.detail(formDto);
}
@Override
@ -109,6 +115,8 @@ public class TopicServiceImpl implements TopicService {
return new Result().error("获取用户信息失败");
}
formDto.setUserId(userDetail.getUserId());
formDto.setNickname(userDetail.getNickname());
formDto.setMobile(userDetail.getMobile());
return topicFeignClient.changeToIssue(formDto);
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java
View File

@ -144,7 +144,8 @@ public class EventCommentDTO implements Serializable {
private Date updatedTime;
/**
* PARTY_FLAG 党员标识（0-否，1-是）
* 党员标识 0-否，1-是
*/
private String partyFlag;
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
View File

@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.List;
@ -19,11 +20,13 @@ public class EpdcEventSubmitFormDTO implements Serializable {
* 事件内容
*/
@NotBlank(message = "事件内容不能为空")
@Size(min = 1, max = 500, message = "事件内容不能为空且在500个字以内")
private String eventContent;
/**
* 事件地址
*/
@NotBlank(message = "地址信息不能为空")
@Size(min = 1, max = 100, message = "地址信息不能为空且在100个字以内")
private String issueAddress;
/**
* 经度

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
View File

@ -216,8 +216,8 @@
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
</properties>
</profile>
</profiles>

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
View File

@ -32,7 +32,7 @@ public class EpdcAppEventsController {
@PostMapping("submit")
public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) {
//效验数据
ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
ValidatorUtils.validateEntity(formDto);
epdcEventsService.saveEvent(formDto);
return new Result();
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
View File

@ -242,8 +242,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
if (StringUtils.isNotEmpty(entity.getGroupId())) {
// 更新话题状态
Map<String, String> map = new HashMap<>();
map.put("topicId", entity.getTopicId());
map.put("id", entity.getTopicId());
map.put("state", "15");
map.put("itemId", itemEntity.getId());
groupFeignClient.modifyTopicState(map);
}
// 发送菜单消息-待处理项目

5
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java
View File

@ -34,4 +34,9 @@ public class GroupSettingStateDTO implements Serializable {
*/
private String processingOpinions;
/**
* 操作用户ID
*/
private String userId;
}

5
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java
View File

@ -25,4 +25,9 @@ public class UserReviewDto implements Serializable {
* 审核意见
*/
private String auditOpinion;
/**
* 用户ID
*/
private String userId;
}

10
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java
View File

@ -37,4 +37,14 @@ public class TopicChangeToIssueFormDTO implements Serializable {
* 操作人ID
*/
private String userId;
/**
* 操作人
*/
private String nickname;
/**
* 操作人手机号
*/
private String mobile;
}

23
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java
View File

@ -0,0 +1,23 @@
package com.elink.esua.epdc.dto.topic.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author：liuchuang
* @Date：2019/12/16 11:59
*/
@Data
public class TopicDetailFormDTO implements Serializable {
private static final long serialVersionUID = -5491908221321780309L;
/**
* 话题ID
*/
private String id;
/**
* 用户ID
*/
private String userId;
}

21
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java
View File

@ -58,22 +58,27 @@ public class TopicDetailResultDTO implements Serializable {
private Integer browseNum;
/**
* 是否可操作（true 可评、赞等）
* 社群状态（ 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散）
*/
private Boolean operationalFlag;
private Integer groupState;
/**
* 是否可关闭（true 可以）
* 话题状态（0：讨论中，10：已转议题，15：已转项目，20：已关闭）
*/
private Boolean closeFlag;
private Integer topicState;
/**
* 是否可转议题（true 可以）
* 图片
*/
private Boolean changeFlag;
private List<String> images;
/**
* 图片
* 社群ID
*/
private List<String> images;
private String groupId;
/**
* 群主标识 0-否，1-是
*/
private String lordFlag;
}

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

@ -125,6 +125,7 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
informationFormDTO.setType(TopicNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
informationFormDTO.setUserId(commentDto.getUserId());
informationFormDTO.setContent(commentDto.getContent());
informationFormDTO.setBusinessId(commentDto.getTopicId());
if (NumConstant.ZERO_STR.equals(formDto.getAttitude()) || NumConstant.ONE_STR.equals(formDto.getAttitude())){
if (topicCommentUserAttitudeEntity == null){

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
View File

@ -195,10 +195,12 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
List<GroupUserListResultDTO> userListResultDTOS = userGroupService.listOfUserGroup(dto.getId(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
for (GroupUserListResultDTO usersDTO:
userListResultDTOS) {
if (!usersDTO.getUserId().equals(dto.getUserId())) {
informationFormDTO.setUserId(usersDTO.getUserId());
newsTask.insertUserInformation(informationFormDTO);
}
}
}
return new Result();
}

12
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
View File

@ -213,17 +213,17 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
// 获取社群信息
GroupDTO groupDto = groupService.get(formDto.getGroupId());
// 组装发送消息内容
for (UserGroupEntity userGroupEntity:
userGroupEntities) {
for (UserReviewDto userReviewDto:
formDto.getMembers()) {
EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
informationFormDTO.setType(GroupNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
informationFormDTO.setUserId(userGroupEntity.getUserId());
if (GroupUserStateEnum.GROUP_USER_STATE_AUDIT_NOT_PASSED.getValue().equals(userGroupEntity.getState())) {
informationFormDTO.setUserId(userReviewDto.getUserId());
if (GroupUserStateEnum.GROUP_USER_STATE_AUDIT_NOT_PASSED.getValue().equals(userReviewDto.getState())) {
informationFormDTO.setTitle(GroupNoticeConstant.NOTICE_GROUP_USER_REVIEW_NOT_PASSED);
informationFormDTO.setContent(GroupNoticeConstant.NOTICE_GROUP_USER_REVIEW_NOT_PASSED_CONTENT
.replace("groupName", groupDto.getGroupName())
.replace("auditOpinion", userGroupEntity.getAuditOpinion()));
informationFormDTO.setBusinessId(userGroupEntity.getId());
.replace("auditOpinion", userReviewDto.getAuditOpinion()));
informationFormDTO.setBusinessId(userReviewDto.getId());
informationFormDTO.setBusinessType(GroupNoticeConstant.NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS);
} else {
informationFormDTO.setTitle(GroupNoticeConstant.NOTICE_GROUP_USER_REVIEW_PASSED);

11
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/AppTopicController.java
View File

@ -4,10 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
import com.elink.esua.epdc.modules.topic.service.TopicService;
@ -68,9 +65,9 @@ public class AppTopicController {
* @author liuchuang
* @since 2019/11/7 15:37
*/
@GetMapping("detail/{id}")
public Result<TopicDetailResultDTO> detail(@PathVariable("id") String id) {
TopicDetailResultDTO data = topicService.getTopicDetailById(id);
@GetMapping("detail")
public Result<TopicDetailResultDTO> detail(@RequestBody TopicDetailFormDTO formDto) {
TopicDetailResultDTO data = topicService.getTopicDetailById(formDto);
return new Result<TopicDetailResultDTO>().ok(data);
}

8
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java
View File

@ -23,11 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
import com.elink.esua.epdc.dto.topic.TopicDTO;
import com.elink.esua.epdc.dto.topic.TopicDetailDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
import com.elink.esua.epdc.modules.topic.entity.TopicEntity;
@ -151,7 +147,7 @@ public interface TopicService extends BaseService<TopicEntity> {
* @author liuchuang
* @since 2019/11/7 15:34
*/
TopicDetailResultDTO getTopicDetailById(String id);
TopicDetailResultDTO getTopicDetailById(TopicDetailFormDTO formDto);
/**
*

30
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
View File

@ -46,11 +46,7 @@ import com.elink.esua.epdc.dto.issue.IssueDTO;
import com.elink.esua.epdc.dto.topic.GroupTopicUserReadDTO;
import com.elink.esua.epdc.dto.topic.TopicDTO;
import com.elink.esua.epdc.dto.topic.TopicDetailDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
import com.elink.esua.epdc.modules.async.NewsTask;
@ -206,15 +202,24 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
}
@Override
public TopicDetailResultDTO getTopicDetailById(String id) {
TopicDetailResultDTO resultDto = baseDao.selectOneOfTopicDetailById(id);
public TopicDetailResultDTO getTopicDetailById(TopicDetailFormDTO formDto) {
TopicDetailResultDTO resultDto = baseDao.selectOneOfTopicDetailById(formDto.getId());
if (null != resultDto) {
// 更新浏览次数
TopicEntity entity = new TopicEntity();
entity.setId(id);
entity.setId(formDto.getId());
entity.setBrowseNum(resultDto.getBrowseNum() + 1);
this.updateById(entity);
// 获取群主信息
UserGroupDTO userGroupDto = userGroupService.getLordInfoByGroupId(resultDto.getGroupId());
if (formDto.getUserId().equals(userGroupDto.getUserId())) {
resultDto.setLordFlag(NumConstant.ONE_STR);
} else {
resultDto.setLordFlag(NumConstant.ZERO_STR);
}
}
return resultDto;
}
@ -300,12 +305,9 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
EpdcEventSubmitFormDTO eventSubmitFormDto = baseDao.selectOneOfTopicForChangeToIssue(formDto.getId());
eventSubmitFormDto.setCategoryId(formDto.getCategoryId());
eventSubmitFormDto.setAdvice(formDto.getAdvice());
UserDetail user = SecurityUser.getUser();
if (null != user) {
eventSubmitFormDto.setChangeUserId(user.getId());
eventSubmitFormDto.setChangeUsername(user.getUsername());
eventSubmitFormDto.setChangeUserMobile(user.getMobile());
}
eventSubmitFormDto.setChangeUserId(null);
eventSubmitFormDto.setChangeUsername(formDto.getNickname());
eventSubmitFormDto.setChangeUserMobile(formDto.getMobile());
Result<IssueDTO> eventResult = eventFeignClient.submitEvent(eventSubmitFormDto);
if (!eventResult.success()) {
return eventResult;

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml
View File

@ -133,7 +133,7 @@
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.elink.esua.epdc" level="INFO"/>
<logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
<logger name="com.elink.esua.epdc.modules.group.dao" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>

3
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml
View File

@ -148,7 +148,9 @@
WHERE
t1.DEL_FLAG = '0'
AND t1.SHIELD_FLAG = '0'
<if test="timestamp != null and timestamp.trim() != ''">
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
</if>
AND t1.TOPIC_ID = #{topicId}
ORDER BY
<if test='orderType == "1"'>
@ -244,6 +246,7 @@
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME,
PARTY_FLAG,
'0' AS SENSITIVE_FLAG
FROM
epdc_topic_comment

16
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
View File

@ -111,22 +111,24 @@
gp.ID,
gp.GROUP_NAME,
gp.GROUP_AVATAR,
COUNT( ugp1.ID ) AS totalNum,
CASE
WHEN SUM( ugp1.PARTY_MEMBER = '1' ) IS NULL THEN
0 ELSE SUM( ugp1.PARTY_MEMBER = '1' )
END AS partyMemberNum
COUNT( DISTINCT ugp1.ID ) AS totalNum,
COUNT( DISTINCT ugp2.ID ) AS partyMemberNum
FROM
epdc_group gp
LEFT JOIN epdc_user_group ugp1 ON gp.ID = ugp1.GROUP_ID
AND ugp1.DEL_FLAG = '0'
AND ugp1.STATE = 10
LEFT JOIN epdc_user_group ugp2 ON gp.ID = ugp2.GROUP_ID
AND ugp2.DEL_FLAG = '0'
AND ugp2.STATE = 10
AND ugp2.PARTY_MEMBER = '1'
LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID
AND tp.DEL_FLAG = '0'
WHERE
gp.DEL_FLAG = '0'
AND gp.STATE IN ( 10, 15 )
AND gp.GRID_ID = #{gridId}
AND gp.GROUP_CATEGORY = '1'
AND gp.ID NOT IN ( SELECT ugp.GROUP_ID FROM epdc_user_group ugp WHERE ugp.USER_ID = #{userId} AND ugp.DEL_FLAG = '0' AND ugp.STATE = 10 )
GROUP BY
gp.ID
@ -146,8 +148,8 @@
ugp2.LORD_FLAG,
COUNT( DISTINCT tp.ID ) AS topicNum,
CASE
WHEN SUM( tp.STATE = 15 OR tp.STATE = 20 ) IS NULL THEN
0 ELSE SUM( tp.STATE = 15 OR tp.STATE = 20 )
WHEN SUM( tp.STATE = 10 OR tp.STATE = 15 ) IS NULL THEN
0 ELSE SUM( tp.STATE = 10 OR tp.STATE = 15 )
END AS changeToIssueNum
FROM
epdc_group gp

31
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
View File

@ -17,9 +17,9 @@
<result property="userAvatar" column="USER_FACE"/>
<result property="partyMember" column="PARTY_MEMBER"/>
<result property="browseNum" column="BROWSE_NUM"/>
<result property="operationalFlag" column="operationalFlag"/>
<result property="closeFlag" column="closeFlag"/>
<result property="changeFlag" column="changeFlag"/>
<result property="groupState" column="groupState"/>
<result property="topicState" column="topicState"/>
<result property="groupId" column="groupId"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -35,21 +35,9 @@
tp.PARTY_MEMBER,
tp.BROWSE_NUM,
img.IMG_URL,
CASE
gp.STATE
WHEN 10 THEN
TRUE ELSE FALSE
END AS operationalFlag,
CASE
WHEN gp.STATE = 20
OR tp.STATE <![CDATA[ <> ]]> 0 THEN
FALSE ELSE TRUE
END AS closeFlag,
CASE
WHEN gp.STATE = 20
OR tp.STATE <![CDATA[ <> ]]> 0 THEN
FALSE ELSE TRUE
END AS changeFlag
gp.ID AS groupId,
gp.STATE AS groupState,
tp.STATE AS topicState
FROM
epdc_topic tp
LEFT JOIN epdc_topic_img img ON tp.ID = img.REFERENCE_ID
@ -108,6 +96,8 @@
tp.ALL_DEPT_NAMES,
tp.PARENT_DEPT_IDS,
tp.PARENT_DEPT_NAMES,
tp.COMMENT_NUM,
tp.BROWSE_NUM,
img.IMG_URL
FROM
epdc_topic tp
@ -168,14 +158,17 @@
t1.DEL_FLAG = '0'
<if test="userId != null and userId.trim() != ''">
and t1.USER_ID = #{userId}
and t1.STATE IN (0, 20)
</if>
<if test="userId == null or userId.trim() == ''">
AND t1.STATE <![CDATA[ <> ]]> 20
AND t1.GROUP_ID = #{groupId}
AND t1.GRID_ID = #{gridId}
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
<if test="timestamp != null and timestamp.trim() != ''">
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
</if>
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
</if>
ORDER BY
t1.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}

Write Preview
Loading…
Cancel
Save