From fb3824be8f6ce87b8a2a74b60cfb337202e1f73c Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 9 Sep 2020 09:22:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86=E5=9F=8B?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-api/pom.xml | 19 ++++ .../epdc/controller/ApiAppUserController.java | 36 ++++++- .../epdc/controller/ApiCommentController.java | 100 +++++++++++++++++- .../epdc/controller/ApiGroupController.java | 50 ++++----- .../epdc/controller/ApiIssueController.java | 83 ++++++++++++++- .../epdc/controller/ApiItemController.java | 18 +++- .../controller/ApiTopicCommentController.java | 45 +++++++- .../epdc/controller/ApiTopicController.java | 30 +++--- .../controller/ApiWorkIssueController.java | 80 ++++++++++++-- .../controller/ApiWorkItemController.java | 72 ++++++++++++- .../controller/ApiWorkUserController.java | 33 +++++- .../controller/v2/ApiAppUserV2Controller.java | 35 ++++++ .../java/com/elink/esua/epdc/modules/.gitkeep | 0 .../news/controller/ApiNewsController.java | 53 +++++++++- .../modules/news/service/NewsService.java | 12 ++- .../news/service/impl/NewsServiceImpl.java | 11 +- .../controller/ApiPointsController.java | 59 +++++++++++ .../points/feign/PointsFeignClient.java | 63 +++++++++++ .../fallback/PointsFeignClientFallback.java | 38 +++++++ .../modules/points/service/PointsService.java | 45 ++++++++ .../service/impl/PointsServiceImpl.java | 39 +++++++ .../epdc/service/impl/GroupServiceImpl.java | 8 +- .../epdc/service/impl/IssueServiceImpl.java | 24 +++-- .../epdc/service/impl/TopicServiceImpl.java | 10 +- .../src/main/resources/application-test.yml | 8 +- .../src/main/resources/application.yml | 8 ++ 26 files changed, 883 insertions(+), 96 deletions(-) delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/.gitkeep create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/controller/ApiPointsController.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/PointsFeignClient.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/PointsFeignClientFallback.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/PointsService.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/impl/PointsServiceImpl.java diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index f446f2a..cd05504 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -101,6 +101,13 @@ ${epdc-cloud-commons.version} + + + com.esua.epdc.yushan + epdc-commons-points-tools + 1.0.0 + + @@ -197,6 +204,10 @@ wxb61fe7aced26ba7b 373c305e69b78f4d575d355fddb05146 + + 47.104.85.99:9876 + yushan-pointsGroup + yushan-pointsGroup @@ -238,6 +249,10 @@ wxb61fe7aced26ba7b 373c305e69b78f4d575d355fddb05146 + + 47.104.85.99:9876 + yushan-pointsGroup + yushan-pointsGroup @@ -280,6 +295,10 @@ wxb61fe7aced26ba7b 373c305e69b78f4d575d355fddb05146 + + 172.16.1.242:9876;172.16.1.243:9876 + yushan-pointsGroup + yushan-pointsGroup diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 4e48eee..4391a22 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.*; @@ -12,6 +13,7 @@ import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -234,6 +236,38 @@ public class ApiAppUserController { return appUserService.completeUserInfo(tokenDto, formDto); } + /** + * 居民完善个人信息-保存 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/10/26 13:41 + */ + @PostMapping("user/completeResidentInfo") + @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_RESIDENT_INFO, referenceId = "#{tokenDto.getUserId}", userId = "#{tokenDto.getUserId}") + public Result completeResidentInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return appUserService.completeUserInfo(tokenDto, formDto); + } + + /** + * 党员完善个人信息-保存 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/10/26 13:41 + */ + @PostMapping("user/completePartyInfo") + @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_PARTY_INFO, referenceId = "#{tokenDto.getUserId}", userId = "#{tokenDto.getUserId}") + public Result completePartyInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return appUserService.completeUserInfo(tokenDto, formDto); + } + /** * 用于用户完善个人信息页面，获取个人信息 * @@ -281,10 +315,10 @@ public class ApiAppUserController { * @date 2019/12/13 14:41 */ @PostMapping("volunteer/authenticate") + @RecordUserBehavior(behavior = BehaviorEnum.VOLUNTEER_PERFECT_INFO, referenceId = "#{tokenDto.getUserId}", userId = "#{tokenDto.getUserId}") public Result volunteerAuthenticate(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteVolunteerInfoFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return appUserService.volunteerAuthenticate(tokenDto, formDto); - } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java index 9ce549b..a0f8143 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java @@ -2,17 +2,20 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.CommentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** * 移动端接口-评论模块 + * * @Author WJP * @Date 2019/9/9 09:45 */ @@ -25,13 +28,14 @@ public class ApiCommentController { /** * 提交评论或回复接口 + * * @param userDetail * @param commentFormDTO * @return */ @PostMapping("submit") public Result submit(@LoginUser TokenDto userDetail, @RequestBody CommentFormDTO commentFormDTO) { - return commentService.submit(userDetail,commentFormDTO); + return commentService.submit(userDetail, commentFormDTO); } /** @@ -39,10 +43,100 @@ public class ApiCommentController { */ @PostMapping("statement") public Result statement(@LoginUser TokenDto userDetail, @RequestBody CommentStatementFormDTO commentStatementFormDTO) { - return commentService.statement(userDetail,commentStatementFormDTO); + return commentService.statement(userDetail, commentStatementFormDTO); } + + /** + * 提交议题评论 + * + * @param userDetail + * @param commentFormDTO + * @return + */ + @PostMapping("issueCom") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_COMMENT, referenceId = "#{commentFormDTO.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueCom(@LoginUser TokenDto userDetail, @RequestBody CommentFormDTO commentFormDTO) { + return commentService.submit(userDetail, commentFormDTO); + } + + /** + * 提交议题回复接口 + * + * @param userDetail + * @param commentFormDTO + * @return + */ + @PostMapping("issueComReply") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_COMMENT_REPLY, referenceId = "#{commentFormDTO.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueComReply(@LoginUser TokenDto userDetail, @RequestBody CommentFormDTO commentFormDTO) { + return commentService.submit(userDetail, commentFormDTO); + } + + /** + * 提交项目评论接口 + * + * @param userDetail + * @param commentFormDTO + * @return + */ + @PostMapping("itemCom") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_COMMENT, referenceId = "#{commentFormDTO.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemCom(@LoginUser TokenDto userDetail, @RequestBody CommentFormDTO commentFormDTO) { + return commentService.submit(userDetail, commentFormDTO); + } + + /** + * 提交项目回复接口 + * + * @param userDetail + * @param commentFormDTO + * @return + */ + @PostMapping("itemComReply") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_COMMENT_REPLY, referenceId = "#{commentFormDTO.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemComReply(@LoginUser TokenDto userDetail, @RequestBody CommentFormDTO commentFormDTO) { + return commentService.submit(userDetail, commentFormDTO); + } + + /** + * 议题评论点赞 + */ + @PostMapping("issueComLike") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_COMMENT_SUPPORT, referenceId = "#{commentStatementFormDTO.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueComLike(@LoginUser TokenDto userDetail, @RequestBody CommentStatementFormDTO commentStatementFormDTO) { + return commentService.statement(userDetail, commentStatementFormDTO); + } + + /** + * 议题评论点踩 + */ + @PostMapping("issueComUnlike") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_COMMENT_OPPOSITION, referenceId = "#{commentStatementFormDTO.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueComUnlike(@LoginUser TokenDto userDetail, @RequestBody CommentStatementFormDTO commentStatementFormDTO) { + return commentService.statement(userDetail, commentStatementFormDTO); + } + + /** + * 项目评论点赞 + */ + @PostMapping("itemComLike") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_COMMENT_SUPPORT, referenceId = "#{commentStatementFormDTO.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemComLike(@LoginUser TokenDto userDetail, @RequestBody CommentStatementFormDTO commentStatementFormDTO) { + return commentService.statement(userDetail, commentStatementFormDTO); + } + + /** + * 项目评论点踩 + */ + @PostMapping("itemComUnlike") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_COMMENT_OPPOSITION, referenceId = "#{commentStatementFormDTO.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemComUnlike(@LoginUser TokenDto userDetail, @RequestBody CommentStatementFormDTO commentStatementFormDTO) { + return commentService.statement(userDetail, commentStatementFormDTO); + } + /** * 评论列表 + * * @Params: [userDetail, formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -50,7 +144,7 @@ public class ApiCommentController { */ @GetMapping("list") public Result listOfComments(@LoginUser TokenDto userDetail, EventCommentsFormDTO formDto) { - return commentService.listOfComments(userDetail,formDto); + return commentService.listOfComments(userDetail, formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java index bdd74dc..fc7617c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; @@ -9,6 +10,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; import com.elink.esua.epdc.dto.group.result.*; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.GroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,7 +18,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * * 移动端接口-社群模块 * * @Author：liuchuang @@ -30,39 +31,38 @@ public class ApiGroupController { private GroupService groupService; /** - * * 创建社群 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/17 13:58 */ @PostMapping("create") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_CREATE_APPLICATION, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result createGroup(@LoginUser TokenDto userDetail, @RequestBody GroupCreateFormDTO formDto) { return groupService.saveGroup(userDetail, formDto); } /** - * * 解散社群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/21 9:51 */ @PostMapping("disband") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_DISSOLUTION, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result disbandGroup(@LoginUser TokenDto userDetail, @RequestBody GroupSettingStateDTO formDto) { return groupService.disbandGroup(userDetail, formDto); } /** - * * 我的群列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/10/21 17:20 */ @@ -72,11 +72,10 @@ public class ApiGroupController { } /** - * * 推荐群列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/10/22 13:53 */ @@ -86,11 +85,10 @@ public class ApiGroupController { } /** - * * 社群详情 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, id] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/10/22 15:14 */ @@ -100,39 +98,38 @@ public class ApiGroupController { } /** - * * 修改群介绍 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/22 15:33 */ @PostMapping("modifyIntroduction") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_MODIFY_INFO, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result modifyIntroduction(@LoginUser TokenDto userDetail, @RequestBody GroupIntroductionFormDTO formDto) { return groupService.modifyIntroduction(userDetail, formDto); } /** - * * 修改群头像 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/22 17:25 */ @PostMapping("modifyAvatar") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_MODIFY_INFO, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result modifyAvatar(@LoginUser TokenDto userDetail, @RequestBody GroupModifyAvatarFormDTO formDto) { return groupService.modifyAvatar(userDetail, formDto); } /** - * * 社群成员列表（待审核/审核通过） * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 9:13 */ @@ -142,11 +139,10 @@ public class ApiGroupController { } /** - * * 移除社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:35 */ @@ -156,11 +152,10 @@ public class ApiGroupController { } /** - * * 退出社群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:40 */ @@ -170,11 +165,10 @@ public class ApiGroupController { } /** - * * 添加成员列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/10/23 16:39 */ @@ -184,11 +178,10 @@ public class ApiGroupController { } /** - * * 添加社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 9:17 */ @@ -198,11 +191,10 @@ public class ApiGroupController { } /** - * * 审核入群申请 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 13:22 */ @@ -212,15 +204,15 @@ public class ApiGroupController { } /** - * * 申请入群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/11 14:00 */ @PostMapping("applyForGroup") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_JOIN_APPLICATION, referenceId = "#{formDto.getGroupId}", userId = "#{userDetail.getUserId}") public Result applyForGroup(@LoginUser TokenDto userDetail, @RequestBody GroupApplyFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return groupService.applyForGroup(userDetail, formDto); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 0e3d5fa..ee41367 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; @@ -10,6 +11,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuesAndEventsOfMineFormDTO; import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; import com.elink.esua.epdc.dto.issue.result.*; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.IssueService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +24,7 @@ import java.util.Map; /** * 移动端接口-议题模块 + * * @Author LC * @Date 2019/9/6 20:04 */ @@ -34,20 +37,23 @@ public class ApiIssueController { /** * 发布事件 + * * @Params: [userDetail, formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/8 15:36 */ @PostMapping("submit") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_PUBLISH, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result submitEvent(@LoginUser TokenDto userDetail, @RequestBody EpdcEventSubmitFormDTO formDto) { return issueService.saveEvent(userDetail, formDto); } /** * 议题最新最热列表 + * * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/7 12:08 */ @@ -58,6 +64,7 @@ public class ApiIssueController { /** * 图片上传 + * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -74,6 +81,7 @@ public class ApiIssueController { /** * 议题（赞/踩） + * * @param userDetail * @param formDto * @return @@ -84,20 +92,84 @@ public class ApiIssueController { formDto.setUserName(userDetail.getNickname()); return issueService.statement(formDto); } + + /** + * 议题赞 + * + * @param userDetail + * @param formDto + * @return + */ + @PostMapping("issueSupport") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_SUPPORT, referenceId = "#{formDto.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueSupport(@LoginUser TokenDto userDetail, @RequestBody StatementFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setUserName(userDetail.getNickname()); + return issueService.statement(formDto); + } + + /** + * 议题踩 + * + * @param userDetail + * @param formDto + * @return + */ + @PostMapping("issueOpposition") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_OPPOSITION, referenceId = "#{formDto.getIssueId}", userId = "#{userDetail.getUserId}") + public Result issueOpposition(@LoginUser TokenDto userDetail, @RequestBody StatementFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setUserName(userDetail.getNickname()); + return issueService.statement(formDto); + } + + /** + * 项目赞 + * + * @param userDetail + * @param formDto + * @return + */ + @PostMapping("itemSupport") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_SUPPORT, referenceId = "#{formDto.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemSupport(@LoginUser TokenDto userDetail, @RequestBody StatementFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setUserName(userDetail.getNickname()); + return issueService.statement(formDto); + } + + /** + * 项目踩 + * + * @param userDetail + * @param formDto + * @return + */ + @PostMapping("itemOpposition") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_OPPOSITION, referenceId = "#{formDto.getItemId}", userId = "#{userDetail.getUserId}") + public Result itemOpposition(@LoginUser TokenDto userDetail, @RequestBody StatementFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setUserName(userDetail.getNickname()); + return issueService.statement(formDto); + } + /** * 议题详情 + * * @Params: [userDetail, issueId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/9 11:16 */ @GetMapping("detail/{issueId}") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_BROWSE, referenceId = "#{issueId}", userId = "#{userDetail.getUserId}") public Result issueDetail(@LoginUser TokenDto userDetail, @PathVariable String issueId) { return issueService.getIssueDetail(userDetail, issueId); } /** * 议题分类统计 + * * @Params: [userDetail, firstCategoryCode] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -110,8 +182,9 @@ public class ApiIssueController { /** * 议题处理进度 + * * @Params: [issueId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/9 13:14 */ @@ -122,8 +195,9 @@ public class ApiIssueController { /** * 我的议题和事件列表 + * * @Params: [formDTO] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/17 16:11 */ @@ -134,6 +208,7 @@ public class ApiIssueController { /** * 事件详情 + * * @Params: [eventId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -148,7 +223,7 @@ public class ApiIssueController { * 分类列表 */ @GetMapping("category/list") - public Result> categorylist(){ + public Result> categorylist() { return issueService.categorylist(); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 1c795d9..2349cf3 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; @@ -10,6 +11,7 @@ import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,6 +20,7 @@ import java.util.List; /** * 移动端接口-项目模块 + * * @Author LC * @Date 2019/9/9 16:32 */ @@ -30,8 +33,9 @@ public class ApiItemController { /** * 项目列表 + * * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/9 16:34 */ @@ -42,24 +46,28 @@ public class ApiItemController { /** * 项目详情 + * * @Params: [userDetail, itemId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/10 20:42 */ @GetMapping("detail/{itemId}") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_BROWSE, referenceId = "#{itemId}", userId = "#{userDetail.getUserId}") public Result itemDetail(@LoginUser TokenDto userDetail, @PathVariable String itemId) { return itemService.getItemDetail(userDetail, itemId); } @PostMapping("evaluation") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_EVALUATION, referenceId = "#{evaluationFormDTO.getItemId}", userId = "#{userDetail.getUserId}") public Result evaluation(@LoginUser TokenDto userDetail, @RequestBody EvaluationFormDTO evaluationFormDTO) { - return itemService.evaluation(userDetail,evaluationFormDTO); + return itemService.evaluation(userDetail, evaluationFormDTO); } /** * 项目分类统计 + * * @Params: [userDetail, categoryCode] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -72,8 +80,9 @@ public class ApiItemController { /** * 项目处理进度 + * * @Params: [itemId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/17 11:09 */ @@ -84,8 +93,9 @@ public class ApiItemController { /** * 我的项目列表 + * * @Params: [userDetail, formDTO] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/17 13:27 */ diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicCommentController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicCommentController.java index a325ea0..80bd83b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicCommentController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicCommentController.java @@ -2,17 +2,20 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; 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; import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.TopicCommentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** * 移动端接口-评论模块 + * * @Author WJP * @Date 2019/9/9 09:45 */ @@ -28,7 +31,25 @@ public class ApiTopicCommentController { */ @PostMapping("submit") public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { - return topicCommentService.submit(userDetail,topicCommentFormDTO); + return topicCommentService.submit(userDetail, topicCommentFormDTO); + } + + /** + * 提交评论接口 + */ + @PostMapping("topicCom") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_COMMENT, referenceId = "#{topicCommentFormDTO.getTopicId}", userId = "#{userDetail.getUserId}") + public Result topicCom(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { + return topicCommentService.submit(userDetail, topicCommentFormDTO); + } + + /** + * 提交回复接口 + */ + @PostMapping("topicReply") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_COMMENT_REPLY, referenceId = "#{topicCommentFormDTO.getTopicId}", userId = "#{userDetail.getUserId}") + public Result topicReply(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { + return topicCommentService.submit(userDetail, topicCommentFormDTO); } /** @@ -36,7 +57,25 @@ public class ApiTopicCommentController { */ @PostMapping("statement") public Result statement(@LoginUser TokenDto userDetail, @RequestBody TopicCommentStatementFormDTO topicCommentStatementFormDTO) { - return topicCommentService.statement(userDetail,topicCommentStatementFormDTO); + return topicCommentService.statement(userDetail, topicCommentStatementFormDTO); + } + + /** + * 评论（赞） + */ + @PostMapping("topicComLike") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_COMMENT_SUPPORT, referenceId = "#{topicCommentStatementFormDTO.getTopicId}", userId = "#{userDetail.getUserId}") + public Result topicComLike(@LoginUser TokenDto userDetail, @RequestBody TopicCommentStatementFormDTO topicCommentStatementFormDTO) { + return topicCommentService.statement(userDetail, topicCommentStatementFormDTO); + } + + /** + * 评论（踩） + */ + @PostMapping("topicComUnlike") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_COMMENT_OPPOSITION, referenceId = "#{topicCommentStatementFormDTO.getTopicId}", userId = "#{userDetail.getUserId}") + public Result topicComUnlike(@LoginUser TokenDto userDetail, @RequestBody TopicCommentStatementFormDTO topicCommentStatementFormDTO) { + return topicCommentService.statement(userDetail, topicCommentStatementFormDTO); } /** @@ -44,7 +83,7 @@ public class ApiTopicCommentController { */ @GetMapping("list") public Result listOfComments(@LoginUser TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) { - return topicCommentService.listOfComments(userDetail,topicCommentsFormDTO); + return topicCommentService.listOfComments(userDetail, topicCommentsFormDTO); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java index 5ded8ce..06fc0c1 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO; @@ -11,6 +12,7 @@ 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.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.TopicService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; /** - * * 移动端接口-话题模块 * * @Author：liuchuang @@ -33,26 +34,25 @@ public class ApiTopicController { private TopicService topicService; /** - * * 发布话题 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/6 14:46 */ @PostMapping("submit") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_PUBLISH, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicSubmitFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return topicService.saveTopic(userDetail, formDto); } /** - * * 话题列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/11/11 15:04 */ @@ -63,11 +63,10 @@ public class ApiTopicController { } /** - * * 我的话题列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/11/11 15:04 */ @@ -78,25 +77,24 @@ public class ApiTopicController { } /** - * * 话题详情 * - * @params [id] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [id] * @author liuchuang * @since 2019/11/7 15:37 */ @GetMapping("detail/{id}") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_BROWSE, referenceId = "#{id}", userId = "#{userDetail.getUserId}") public Result detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) { return topicService.getTopicDetailById(userDetail, id); } /** - * * 关闭话题 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/7 16:10 */ @@ -107,11 +105,10 @@ public class ApiTopicController { } /** - * * 话题审核记录 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [topicId] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/11/8 9:39 */ @@ -121,26 +118,25 @@ public class ApiTopicController { } /** - * * 转议题 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/8 10:37 */ @PostMapping("changeToIssue") + @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_TO_EVENTS, referenceId = "#{formDto.getId}", userId = "#{userDetail.getUserId}") public Result changeToIssue(@LoginUser TokenDto userDetail, @RequestBody TopicChangeToIssueFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return topicService.changeToIssue(userDetail, formDto); } /** - * * 文件上传 * - * @params [file] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [file] * @author liuchuang * @since 2019/11/25 10:45 */ diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java index a17626e..7e68eed 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.category.EventCategoryDTO; @@ -11,6 +12,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.WorkIssueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,7 +31,8 @@ public class ApiWorkIssueController { /** - *议题数据统计 + * 议题数据统计 + * * @param formDto * @return */ @@ -40,6 +43,7 @@ public class ApiWorkIssueController { /** * 事件列表接口（待回应/已驳回） + * * @param formDto * @return */ @@ -49,7 +53,8 @@ public class ApiWorkIssueController { } /** - *事件详情 + * 事件详情 + * * @param id * @return */ @@ -59,7 +64,8 @@ public class ApiWorkIssueController { } /** - *事件分类 + * 事件分类 + * * @return */ @GetMapping("event/categoryList") @@ -69,7 +75,8 @@ public class ApiWorkIssueController { } /** - *事件审核 + * 事件审核 + * * @return */ @PostMapping("event/review") @@ -78,8 +85,32 @@ public class ApiWorkIssueController { return workIssueService.review(dto); } + /** + * 事件审核 - 通过 + * + * @return + */ + @PostMapping("event/reviewPass") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_AUDIT_PASS, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result reviewPass(@RequestBody EpdcEventsReviewFormDTO dto) { + return workIssueService.review(dto); + } + + /** + * 事件审核 -不通过 + * + * @return + */ + @PostMapping("event/reviewNopass") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_AUDIT_FAILED, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result reviewNopass(@RequestBody EpdcEventsReviewFormDTO dto) { + return workIssueService.review(dto); + } + + /** * 工作端-议题待处理或者已关闭的最新最热列表 + * * @param formDto * @return */ @@ -93,35 +124,34 @@ public class ApiWorkIssueController { * 工作端-议题详情 */ @GetMapping("issue/detail/{issueId}") - public Result issueDetail(@PathVariable("issueId") String issueId){ + public Result issueDetail(@PathVariable("issueId") String issueId) { return workIssueService.selectOneWorkIssueDetail(issueId); } /** * 工作端-事件评论列表 + * * @param formDTO * @return */ @GetMapping("event/commentList") - public Result> commentList(WorkEventCommentListFormDTO formDTO){ + public Result> commentList(WorkEventCommentListFormDTO formDTO) { return workIssueService.selectWorkHotOrNewEventComment(formDTO); } /** - * * 事件评论回复列表接口 */ @GetMapping("event/commentReplyList") - public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){ + public Result commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) { return workIssueService.commentReplyList(workCommentReplyFormDTO); } /** - * * 议题处理进度(后台/工作端用) */ @GetMapping("issue/processList") - public Result> processList(WorkProcessListFormDTO workProcessListFormDTO){ + public Result> processList(WorkProcessListFormDTO workProcessListFormDTO) { return workIssueService.processList(workProcessListFormDTO); } @@ -134,5 +164,35 @@ public class ApiWorkIssueController { return workIssueService.handleSubmit(dto); } + /** + * 议题待处理 - 回应 + */ + @PostMapping("issue/response") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_RESPONSE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result response(@RequestBody IssueWaitHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return workIssueService.handleSubmit(dto); + } + + /** + * 议题待处理 - 关闭 + */ + @PostMapping("issue/close") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_CLOSE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result close(@RequestBody IssueWaitHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return workIssueService.handleSubmit(dto); + } + + /** + * 议题待处理 -- 转项目 + */ + @PostMapping("issue/toItem") + @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_TO_PROJECT, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result toItem(@RequestBody IssueWaitHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return workIssueService.handleSubmit(dto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 52d4c71..1948f23 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -1,9 +1,11 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.WorkItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +14,7 @@ import java.util.List; /** * 移动端接口-项目模块 + * * @Author LPF * @Date 2019/11/18 13:32 */ @@ -24,6 +27,7 @@ public class ApiWorkItemController { /** * 项目统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -33,20 +37,23 @@ public class ApiWorkItemController { public Result itemStatistics(ItemStatisticsFormDTO formDto) { return workItemService.getItemStatistics(formDto); } + /** * 项目列表 + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @GetMapping("list") public Result> listItems(ItemFormDTO formDto) { - return workItemService.listItems( formDto); + return workItemService.listItems(formDto); } /** * 项目详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -56,8 +63,10 @@ public class ApiWorkItemController { public Result itemDetail(@PathVariable String id) { return workItemService.getItemDetail(id); } + /** * 获取满意度评价结果 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -67,8 +76,10 @@ public class ApiWorkItemController { public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluation(evaluationFormDTO); } + /** * 获取可吹哨部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -83,8 +94,63 @@ public class ApiWorkItemController { public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { return workItemService.handleSubmit(dto); } + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 项目处理 - 回应 + * @Author songyunpeng + * @Date 2020/5/7 + * @Param [dto] + **/ + @PostMapping("response") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_RESPONSE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result response(@RequestBody ItemHandleSubmitFormDTO dto) { + return workItemService.handleSubmit(dto); + } + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 项目处理 - 关闭 + * @Author songyunpeng + * @Date 2020/5/7 + * @Param [dto] + **/ + @PostMapping("close") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_CLOSE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result close(@RequestBody ItemHandleSubmitFormDTO dto) { + return workItemService.handleSubmit(dto); + } + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 项目处理 - 吹哨 + * @Author songyunpeng + * @Date 2020/5/7 + * @Param [dto] + **/ + @PostMapping("whistle") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_WHISTLE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result whistle(@RequestBody ItemHandleSubmitFormDTO dto) { + return workItemService.handleSubmit(dto); + } + + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 项目处理 - 结案 + * @Author songyunpeng + * @Date 2020/5/7 + * @Param [dto] + **/ + @PostMapping("closeCase") + @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_CLOSE_CASE, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}") + public Result closeCase(@RequestBody ItemHandleSubmitFormDTO dto) { + return workItemService.handleSubmit(dto); + } + /** * 获取满意度评价部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -94,8 +160,10 @@ public class ApiWorkItemController { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluationDept(evaluationFormDTO); } + /** * 项目处理进度 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index d2c6238..3fe1fb7 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -12,6 +13,7 @@ import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO; import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.WorkUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -94,6 +96,33 @@ public class ApiWorkUserController { return workUserService.authenticateResident(formDTO); } + /** + * 认证用户（用户信息审核） - -通过 + * + * @param formDto + * @return + */ + @PostMapping("swagger/authenticateResidentPass") + @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_PASS, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result authenticateResidentPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workUserService.authenticateResident(formDto); + } + + + /** + * 认证用户（用户信息审核） - 不通过 + * + * @param formDto + * @return + */ + @PostMapping("swagger/authenticateResidentNoPass") + @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_NO_PASS, referenceId = "#{formDto.getUserId}", userId = "#{formDto.getUserId}") + public Result authenticateResidentNoPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workUserService.authenticateResident(formDto); + } + /*** * 用户列表 * @param workUserFromDto @@ -203,7 +232,7 @@ public class ApiWorkUserController { /** - * @param [] + * @param * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 判断是否更新头像 * @author wangtong @@ -215,7 +244,7 @@ public class ApiWorkUserController { } /** - * @param [avatar] + * @param * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 更新头像 * @author wangtong diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java index b746b38..42fa403 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java @@ -4,12 +4,14 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.api.version.ApiVersion; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterV3FormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -69,4 +71,37 @@ public class ApiAppUserV2Controller { ValidatorUtils.validateEntity(formDto); return appUserService.completeUserInfo(tokenDto, formDto); } + + /** + * 完善居民信息，不再进行验证手机号 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/2/20 17:11 + */ + @PostMapping("user/" + Constant.VERSION_CONTROL + "/completeResidentInfo") + @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_RESIDENT_INFO, referenceId = "#{tokenDto.getUserId}", userId = "#{tokenDto.getUserId}") + public Result completeResidentInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormV2DTO formDto) { + ValidatorUtils.validateEntity(formDto); + return appUserService.completeUserInfo(tokenDto, formDto); + } + + /** + * 完善党员信息，不再进行验证手机号 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/2/20 17:11 + */ + @PostMapping("user/" + Constant.VERSION_CONTROL + "/completePartyInfo") + @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_RESIDENT_INFO, referenceId = "#{tokenDto.getUserId}", userId = "#{tokenDto.getUserId}") + public Result completePartyInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormV2DTO formDto) { + ValidatorUtils.validateEntity(formDto); + return appUserService.completeUserInfo(tokenDto, formDto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/.gitkeep b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java index fa62cba..a0d54b1 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java @@ -2,11 +2,13 @@ package com.elink.esua.epdc.modules.news.controller; 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.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.modules.news.service.NewsService; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -49,7 +51,8 @@ public class ApiNewsController { * @date 2019/9/6 14:58 */ @GetMapping("notice/detail/{noticeId}") - public Result getNoticeDetail(@PathVariable("noticeId") String noticeId) { + @RecordUserBehavior(behavior = BehaviorEnum.NOTICE_BROWSE, referenceId = "#{noticeId}", userId = "#{userDetail.getUserId}") + public Result getNoticeDetail(@LoginUser TokenDto userDetail, @PathVariable("noticeId") String noticeId) { return newsService.getNoticeDetail(noticeId); } @@ -110,6 +113,36 @@ public class ApiNewsController { return newsService.updateStatement(userDetail, newsStatementFromDTO); } + /*** + * @Description 点赞 + * @Author qushutong + * @Date 2019/9/7 14:15 + * @Param [] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("news/newsSupport") + @RecordUserBehavior(behavior = BehaviorEnum.NEWS_SUPPORT, referenceId = "#{newsStatementFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") + public Result newsSupport(@LoginUser TokenDto userDetail, @RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO) { + return newsService.updateStatement(userDetail, newsStatementFromDTO); + } + + /*** + * @Description 点踩 + * @Author qushutong + * @Date 2019/9/7 14:15 + * @Param [] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("news/newsOpposition") + @RecordUserBehavior(behavior = BehaviorEnum.NEWS_OPPOSITION, referenceId = "#{newsStatementFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") + public Result newsOpposition(@LoginUser TokenDto userDetail, @RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO) { + return newsService.updateStatement(userDetail, newsStatementFromDTO); + } + /*** * @Description 新闻浏览 * @Author qushutong @@ -120,9 +153,23 @@ public class ApiNewsController { * */ @PostMapping("news/browse") - public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + public Result modifyNewsBrowse(@LoginUser TokenDto userDetail, @RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + ValidatorUtils.validateEntity(newsBrowseFromDTO); + return newsService.modifyNewsBrowse(userDetail, newsBrowseFromDTO); + } + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 新闻浏览有效加积分 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + **/ + @PostMapping("news/browsePoints") + @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") + public Result browsePoints(@LoginUser TokenDto userDetail, @RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { ValidatorUtils.validateEntity(newsBrowseFromDTO); - return newsService.modifyNewsBrowse(newsBrowseFromDTO); + return newsService.browsePoints(userDetail, newsBrowseFromDTO); } /** diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java index 8093a3d..398c13c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.news.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.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; @@ -90,7 +91,7 @@ public interface NewsService { * @Exception * */ - Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO); + Result modifyNewsBrowse(@LoginUser TokenDto userDetail,EpdcNewsBrowseFromDTO newsBrowseFromDTO); /** * 用户消息已读 @@ -142,4 +143,13 @@ public interface NewsService { * @date 2020/6/23 18:03 */ Result> listCategoryBySection(String sectionCode); + + /** + * @Description 新闻浏览有效时间内加积分接口 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java index ebd5a64..f154626 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.news.service.impl; 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.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; @@ -67,7 +68,7 @@ public class NewsServiceImpl implements NewsService { } @Override - public Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + public Result modifyNewsBrowse(@LoginUser TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO) { return newsFeignClient.modifyNewsBrowse(newsBrowseFromDTO); } @@ -101,4 +102,12 @@ public class NewsServiceImpl implements NewsService { public Result> listCategoryBySection(String sectionCode) { return newsFeignClient.listCategoryCodeBySection(sectionCode); } + + @Override + public Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + if (userDetail != null) { + newsBrowseFromDTO.setUserId(userDetail.getUserId()); + } + return new Result(); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/controller/ApiPointsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/controller/ApiPointsController.java new file mode 100644 index 0000000..3eb9e51 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/controller/ApiPointsController.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.modules.points.controller; + +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.form.EpdcAppPointsRankingFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.modules.points.service.PointsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 移动端接口-积分管理模块 + * + * @Author zhangyong + * @Date 2020-04-29 + */ +@RestController +@RequestMapping("points") +public class ApiPointsController { + + @Autowired + private PointsService pointsService; + + /** + * 当前登录用户 积分记录接口 + * + * @param: [userDetail, dto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-04-29 + */ + @GetMapping("pointsRecord/list") + public Result> listPointsRecord(@LoginUser TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return pointsService.listPointsRecord(userDetail, formDto); + } + + /** + * 积分排行接口（0 周排行、1 月排行） + * + * @param: [userDetail, formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-04-30 + */ + @GetMapping("pointsRanking/list") + public Result listPointsRanking(@LoginUser TokenDto userDetail, EpdcAppPointsRankingFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return pointsService.listPointsRanking(userDetail, formDto); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/PointsFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/PointsFeignClient.java new file mode 100644 index 0000000..dac0928 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/PointsFeignClient.java @@ -0,0 +1,63 @@ +package com.elink.esua.epdc.modules.points.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.form.EpdcAppPointsRankingFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.modules.points.feign.fallback.PointsFeignClientFallback; +import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +/** + * 积分管理模块 + * @Author zhangyong + * @Date 2020-04-29 + */ +@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsFeignClientFallback.class) +public interface PointsFeignClient { + + /** + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param userId 必选 用户ID + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-04-29 + */ + @GetMapping(value = "points/epdc-app/points/pointsRecord/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listPointsRecordFeignClient(EpdcAppPointsRecordFormDTO formDto); + + /** + * 积分排行接口（0 周排行、1 月排行） + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式：0-周，1-月 + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-04-30 + */ + @GetMapping(value = "points/epdc-app/points/pointsRanking/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result listPointsRankingFeignClient(EpdcAppPointsRankingFormDTO formDto); + + /** + * @Description 根据动作编码获取积分规则 + * @Author songyunpeng + * @Date 2020/7/21 + * @Param [behaviorCode] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping(value = "points/epdc-app/points/getPointsRuleByBehaviorCode/{behaviorCode}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getPointsRuleByBehaviorCode(@PathVariable("behaviorCode") String behaviorCode); +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/PointsFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/PointsFeignClientFallback.java new file mode 100644 index 0000000..3f451f0 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/PointsFeignClientFallback.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.modules.points.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.form.EpdcAppPointsRankingFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.modules.points.feign.PointsFeignClient; +import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 积分管理模块 + * @Author zhangyong + * @Date 2020-04-29 + */ +@Component +public class PointsFeignClientFallback implements PointsFeignClient { + + @Override + public Result> listPointsRecordFeignClient(EpdcAppPointsRecordFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "listPointsRecordFeignClient", formDto); + } + + @Override + public Result listPointsRankingFeignClient(EpdcAppPointsRankingFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "listPointsRankingFeignClient", formDto); + } + + @Override + public Result getPointsRuleByBehaviorCode(String behaviorCode) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "getPointsRuleByBehaviorCode", behaviorCode); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/PointsService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/PointsService.java new file mode 100644 index 0000000..3e22681 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/PointsService.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.modules.points.service; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; + +import java.util.List; + +/** + * 积分管理模块 + * @Author zhangyong + * @Date 2020-04-29 + */ +public interface PointsService { + + /** + * 当前登录用户 积分记录接口 + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * @param userDetail 必选 获取用户ID + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-04-29 + */ + Result> listPointsRecord(TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto); + + /** + * 积分排行接口（0 周排行、1 月排行） + * + * @param formDto + * param pageIndex 必选 页码 + * param pageSize 必选 页容量 + * param rankingType 必选 排名方式：0-周，1-月 + * @param userDetail 必选 获取用户信息 + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-04-30 + */ + Result listPointsRanking(TokenDto userDetail, EpdcAppPointsRankingFormDTO formDto); +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/impl/PointsServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/impl/PointsServiceImpl.java new file mode 100644 index 0000000..38fa144 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/service/impl/PointsServiceImpl.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.modules.points.service.impl; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.modules.points.feign.PointsFeignClient; +import com.elink.esua.epdc.modules.points.service.PointsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 积分管理模块 + * @Author zhangyong + * @Date 2020-04-29 + */ +@Service +public class PointsServiceImpl implements PointsService { + + @Autowired + private PointsFeignClient pointsFeignClient; + + @Override + public Result> listPointsRecord(TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + return pointsFeignClient.listPointsRecordFeignClient(formDto); + } + + @Override + public Result listPointsRanking(TokenDto userDetail, EpdcAppPointsRankingFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setNickName(userDetail.getNickname()); + return pointsFeignClient.listPointsRankingFeignClient(formDto); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java index 8a91b53..56f00ba 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java @@ -26,7 +26,6 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * * 社群模块 * * @Author：liuchuang @@ -75,7 +74,12 @@ public class GroupServiceImpl implements GroupService { groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); formDto.setGroupUserFormDTO(groupUserFormDTO); - return groupFeignClient.createGroup(formDto); + Result result = groupFeignClient.createGroup(formDto); + if (result.success()) { + formDto.setId(String.valueOf(result.getData())); + } + return result; +// return groupFeignClient.createGroup(formDto); } @Override diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 74c9b43..5d745d4 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -31,6 +31,7 @@ import java.util.List; /** * 议题模块 + * * @Author LC * @Date 2019/9/6 20:15 */ @@ -87,14 +88,21 @@ public class IssueServiceImpl implements IssueService { formDto.setUserId(userDetail.getUserId()); formDto.setNickName(userDetail.getNickname()); formDto.setUserFace(userDetail.getFaceImg()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - formDto.setIsPartyMember(YesOrNoEnum.YES.value()); - } else { - formDto.setIsPartyMember(YesOrNoEnum.NO.value()); - } + if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + formDto.setIsPartyMember(YesOrNoEnum.YES.value()); + } else { + formDto.setIsPartyMember(YesOrNoEnum.NO.value()); + } formDto.setMobile(userDetail.getMobile()); - return issueFeignClient.submitEvent(formDto); + //事件ID返参赋值 + Result result = issueFeignClient.submitEvent(formDto); + if (result.success()) { + formDto.setId(String.valueOf(result.getData())); + } + return result; + +// return issueFeignClient.submitEvent(formDto); } @Override @@ -118,9 +126,9 @@ public class IssueServiceImpl implements IssueService { wxMaSecCheckTask.checkImage(file); // 转base64 in = new FileInputStream(file); - byte[] bytes=new byte[(int)file.length()]; + byte[] bytes = new byte[(int) file.length()]; in.read(bytes); - base64 = "data:image/png;base64,"+Base64.getEncoder().encodeToString(bytes); + base64 = "data:image/png;base64," + Base64.getEncoder().encodeToString(bytes); // 图片上传至OSS UploadFormDTO formDTO = new UploadFormDTO(); formDTO.setBase64String(base64); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java index a0bd8b7..bc465b0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java @@ -19,10 +19,10 @@ import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; + import java.util.List; /** - * * 话题模块 * * @Author：liuchuang @@ -69,7 +69,13 @@ public class TopicServiceImpl implements TopicService { formDto.setMobile(userDetail.getMobile()); formDto.setState(TopicStateEnum.TOPIC_STATE_IN_CONVERSATION.getValue()); - return topicFeignClient.submit(formDto); + Result result = topicFeignClient.submit(formDto); + if (result.success()) { + formDto.setId(String.valueOf(result.getData())); + } + return result; + +// return topicFeignClient.submit(formDto); } @Override diff --git a/epdc-cloud-api/src/main/resources/application-test.yml b/epdc-cloud-api/src/main/resources/application-test.yml index 8a46445..ac5dd6c 100644 --- a/epdc-cloud-api/src/main/resources/application-test.yml +++ b/epdc-cloud-api/src/main/resources/application-test.yml @@ -1,4 +1,4 @@ -nacos: - config: - server-addr: 47.104.224.45:8848 - namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a +#nacos: +# config: +# server-addr: 47.104.224.45:8848 +# namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a diff --git a/epdc-cloud-api/src/main/resources/application.yml b/epdc-cloud-api/src/main/resources/application.yml index f8ff3c1..07d5b3c 100644 --- a/epdc-cloud-api/src/main/resources/application.yml +++ b/epdc-cloud-api/src/main/resources/application.yml @@ -166,3 +166,11 @@ jwt: secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc] #token有效时长，默认7天，单位秒 expire: 604800 + +rocketmq: + name-server: @rocketmq.name.server@ + producer: + group: @rocketmq.producer.group@ + consumer: + points-group: @rocketmq.consumer.points.group@ +