elink-star
/
epdc-cloud-api-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

社区教育 - 兴趣群 - 兴趣群列表 api 以及合并代码

feature/yujt_analysisHomeChange
zhangyuan 5 years ago
parent
0cb36c9822
commit
037c95652e
5 changed files with 222 additions and 0 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. 64
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
  2. 46
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
  3. 26
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
  4. 50
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
  5. 36
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java

64
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
View File

@ -4,6 +4,11 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@ -15,6 +20,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
@ -431,4 +437,62 @@ public class ApiPropertyController {
public Result<List<PsychologyAnswerListResultDTO>> listQuestion(@LoginUser TokenDto userDetail, PsychologyAnswerFormDTO formDto) {
return propertyService.listQuestion(userDetail, formDto);
}
/**
* 社区讲坛 - 居民端获取社区讲坛列表
*
* @param: userDetail, formDto
* @return: Result<List < PsychologyAnswerListResultDTO>>
* @author: zhy
* @date: 2020/6/23 10:04
*/
@GetMapping("activity/list")
public Result<List<ActivityInfoResultDTO>> listActivity(@LoginUser TokenDto userDetail, ActivityInfoFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return propertyService.listActivity(userDetail, formDto);
}
/**
* 社区讲坛 - 居民端获取社区讲坛详情
*
* @param: userDetail, formDto
* @return: Result<List < PsychologyAnswerListResultDTO>>
* @author: zhy
* @date: 2020/6/23 10:04
*/
@GetMapping("activity/detail/{activityId}")
public Result<ActivityDetailResultDTO> activitydetail(@PathVariable("activityId") String activityId, @LoginUser TokenDto userDetail, ActivityDetailFormDTO formDto) {
formDto.setActivityId(activityId);
ValidatorUtils.validateEntity(formDto);
return propertyService.activityDetail(userDetail, formDto);
}
/**
* 社区讲坛 - 居民端  - 活动报名
*
* @param: userDetail, formDto
* @return: Result<List < PsychologyAnswerListResultDTO>>
* @author: zhy
* @date: 2020/6/23 10:04
*/
@PostMapping("activity/detail/{activityId}")
public Result singUp(@PathVariable("activityId") String activityId, @LoginUser TokenDto userDetail, ActivityParticipantFormDTO formDto) {
formDto.setActId(activityId);
ValidatorUtils.validateEntity(formDto);
return propertyService.singUp(userDetail, formDto);
}
/**
* 社区教育 - 兴趣群 - 兴趣群列表
*
* @param: userDetail, formDto
* @return: Result<List < PsychologyAnswerListResultDTO>>
* @author: zhy
* @date: 2020/6/23 10:04
*/
@GetMapping("group/listBySection")
public Result<List<GroupBySectionResultDTO>> listBySection(@LoginUser TokenDto userDetail, GroupBySectionFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return propertyService.listBySection(userDetail, formDto);
}
}

46
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
View File

@ -2,6 +2,11 @@ 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.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@ -9,6 +14,7 @@ import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
@ -342,4 +348,44 @@ public interface PropertyFeignClient {
@GetMapping(value = "property/epdc-app/psychology/listQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<PsychologyAnswerListResultDTO>> listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
/***
* 社区讲坛 - 居民端获取社区讲坛列表
* @param fromDTO
* @return Result<List<PsychologyAnswerListResultDTO>>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
@GetMapping(value = "property/epdc-app/activityinfo/listActivity", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ActivityInfoResultDTO>> listActivity(@RequestBody ActivityInfoFormDTO fromDTO);
/***
* 社区讲坛 - 居民端获取社区讲坛详情
* @param fromDTO
* @return Result<ActivityDetailResultDTO>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
@GetMapping(value = "property/epdc-app/activityinfo/activityDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<ActivityDetailResultDTO> activityDetail(@RequestBody ActivityDetailFormDTO fromDTO);
/***
* 社区讲坛 - 居民端  - 活动报名
* @param fromDTO
* @return Result
* @author zhangyuan
* @date 2020/6/23 10:04
*/
@PostMapping(value = "property/epdc-app/activityinfo/singUp", consumes = MediaType.APPLICATION_JSON_VALUE)
Result singUp(@RequestBody ActivityParticipantFormDTO fromDTO);
/***
* 社区教育 - 兴趣群 - 兴趣群列表
* @param fromDTO
* @return Result<List<PsychologyAnswerListResultDTO>>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
@GetMapping(value = "property/epdc-app/group/listBySection", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<GroupBySectionResultDTO>> listBySection(@RequestBody GroupBySectionFormDTO fromDTO);
}

26
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
View File

@ -3,6 +3,11 @@ package com.elink.esua.epdc.feign.fallback;
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.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@ -10,6 +15,7 @@ import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
@ -193,4 +199,24 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listQuestion", formDto);
}
@Override
public Result<List<ActivityInfoResultDTO>> listActivity(ActivityInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listActivity", formDto);
}
@Override
public Result<ActivityDetailResultDTO> activityDetail(ActivityDetailFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "activityDetail", formDto);
}
@Override
public Result singUp(ActivityParticipantFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "singUp", formDto);
}
@Override
public Result<List<GroupBySectionResultDTO>> listBySection(GroupBySectionFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listBySection", formDto);
}
}

50
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
View File

@ -3,6 +3,11 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@ -14,6 +19,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
@ -337,4 +343,48 @@ public interface PropertyService {
*/
Result<List<PsychologyAnswerListResultDTO>> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto);
/**
* 社区讲坛 - 居民端获取社区讲坛列表
*
* @param userDetail 用户信息
* @param formDto 查询参数
* @return Result<List < PsychologyAnswerListResultDTO>>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
Result<List<ActivityInfoResultDTO>> listActivity(TokenDto userDetail, ActivityInfoFormDTO formDto);
/**
* 社区讲坛 - 居民端获取社区讲坛详情
*
* @param userDetail 用户信息
* @param formDto 查询参数
* @return Result<ActivityDetailResultDTO>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
Result<ActivityDetailResultDTO> activityDetail(TokenDto userDetail, ActivityDetailFormDTO formDto);
/**
* 社区讲坛 - 居民端  - 活动报名
*
* @param userDetail 用户信息
* @param formDto 提交内容
* @return Result
* @author zhangyuan
* @date 2020/6/23 10:04
*/
Result singUp(TokenDto userDetail, ActivityParticipantFormDTO formDto);
/**
* 社区教育 - 兴趣群 - 兴趣群列表
*
* @param userDetail 用户信息
* @param formDto 查询参数
* @return Result<List < GroupBySectionResultDTO>>
* @author zhangyuan
* @date 2020/6/23 10:04
*/
Result<List<GroupBySectionResultDTO>> listBySection(TokenDto userDetail, GroupBySectionFormDTO formDto);
}

36
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
View File

@ -6,6 +6,11 @@ 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.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO;
@ -18,6 +23,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.GroupBySectionResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
@ -49,6 +55,7 @@ import com.elink.esua.epdc.utils.UserTagUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@ -368,4 +375,33 @@ public class PropertyServiceImpl implements PropertyService {
return propertyFeignClient.listQuestion(formDto);
}
@Override
public Result<List<ActivityInfoResultDTO>> listActivity(TokenDto userDetail, ActivityInfoFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
return propertyFeignClient.listActivity(formDto);
}
@Override
public Result<ActivityDetailResultDTO> activityDetail(TokenDto userDetail, ActivityDetailFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
return propertyFeignClient.activityDetail(formDto);
}
@Override
public Result singUp(TokenDto userDetail, ActivityParticipantFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
formDto.setNickname(userDetail.getNickname());
formDto.setFaceImg(userDetail.getFaceImg());
formDto.setRealName(userDetail.getRealName());
formDto.setSex(userDetail.getSex());
formDto.setMobile(userDetail.getMobile());
formDto.setSignUpTime(new Date());
return propertyFeignClient.singUp(formDto);
}
@Override
public Result<List<GroupBySectionResultDTO>> listBySection(TokenDto userDetail, GroupBySectionFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
return propertyFeignClient.listBySection(formDto);
}
}

Write Preview
Loading…
Cancel
Save