From f5e3c457e5bc299a9df704f44fd154cac4de194a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 11:13:15 +0800 Subject: [PATCH 01/15] =?UTF-8?q?api=20=E7=89=A9=E4=B8=9A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiPropertyController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java new file mode 100644 index 0000000..c2dfa6b --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author: qushutong + * @Date: 2020/5/12 11:11 + * @Description: 物业相关 + */ +@RestController +@RequestMapping("property/group") +public class ApiPropertyController { + +} From 61b6be8dd148e06caa7bf5fe7b08357f30803e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 13:25:51 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 220 ++++++++++++++++- .../esua/epdc/feign/PropertyFeignClient.java | 222 ++++++++++++++++++ .../fallback/PropertyFeignClientFallback.java | 108 +++++++++ .../esua/epdc/service/PropertyService.java | 178 ++++++++++++++ .../service/impl/PropertyServiceImpl.java | 201 ++++++++++++++++ 5 files changed, 926 insertions(+), 3 deletions(-) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index c2dfa6b..a48c196 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -1,7 +1,23 @@ package com.elink.esua.epdc.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.epdc.form.EpdcUserGroupInviteFormDTO; +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.GroupDetailForMobileEndResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.service.GroupService; +import com.elink.esua.epdc.service.PropertyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @author: qushutong @@ -11,5 +27,203 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("property/group") public class ApiPropertyController { - + @Autowired + private PropertyService propertyService; + + /** + * + * 创建社群 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/17 13:58 + */ + @PostMapping("create") + public Result createGroup(@LoginUser TokenDto userDetail, @RequestBody GroupCreateFormDTO formDto) { + return propertyService.saveGroup(userDetail, formDto); + } + + /** + * + * 解散社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/21 9:51 + */ + @PostMapping("disband") + public Result disbandGroup(@LoginUser TokenDto userDetail, @RequestBody GroupSettingStateDTO formDto) { + return propertyService.disbandGroup(userDetail, formDto); + } + + /** + * + * 我的群列表 + * + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/21 17:20 + */ + @GetMapping("listOfMine") + public Result> groupsOfMine(@LoginUser TokenDto userDetail) { + return propertyService.listGroupsOfMine(userDetail); + } + + /** + * + * 推荐群列表 + * + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/22 13:53 + */ + @GetMapping("listOfRecommend") + public Result> groupsOfRecommend(@LoginUser TokenDto userDetail) { + return propertyService.listGroupsOfRecommend(userDetail); + } + + /** + * + * 社群详情 + * + * @params [userDetail, id] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/22 15:14 + */ + @GetMapping("detail/{id}") + public Result detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) { + return propertyService.getGroupDetail(userDetail, id); + } + + /** + * + * 修改群介绍 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 15:33 + */ + @PostMapping("modifyIntroduction") + public Result modifyIntroduction(@LoginUser TokenDto userDetail, @RequestBody GroupIntroductionFormDTO formDto) { + return propertyService.modifyIntroduction(userDetail, formDto); + } + + /** + * + * 修改群头像 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 17:25 + */ + @PostMapping("modifyAvatar") + public Result modifyAvatar(@LoginUser TokenDto userDetail, @RequestBody GroupModifyAvatarFormDTO formDto) { + return propertyService.modifyAvatar(userDetail, formDto); + } + + /** + * + * 社群成员列表（待审核/审核通过） + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 9:13 + */ + @GetMapping("listOfMember") + public Result> listOfMember(GroupUsersFormDTO formDto) { + return propertyService.listOfMember(formDto); + } + + /** + * + * 移除社群成员 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:35 + */ + @PostMapping("removeMember") + public Result removeMember(@LoginUser TokenDto userDetail, @RequestBody GroupUserRemoveOrQuitFormDTO formDto) { + return propertyService.removeMember(userDetail, formDto); + } + + /** + * + * 退出社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:40 + */ + @PostMapping("quitGroup") + public Result quitGroup(@LoginUser TokenDto userDetail, @RequestBody GroupUserRemoveOrQuitFormDTO formDto) { + return propertyService.quitGroup(userDetail, formDto); + } + + /** + * + * 添加成员列表 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/23 16:39 + */ + @GetMapping("getInviteList") + public Result> getInviteList(@LoginUser TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto) { + return propertyService.listOfInviteUsers(userDetail, formDto); + } + + /** + * + * 添加社群成员 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 9:17 + */ + @PostMapping("addMember") + public Result addMember(@RequestBody GroupAddUserFormDTO formDto) { + return propertyService.saveGroupUsers(formDto); + } + + /** + * + * 审核入群申请 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 13:22 + */ + @PostMapping("reviewApply") + public Result reviewApply(@RequestBody GroupUserReviewFormDTO formDto) { + return propertyService.updateGroupUsers(formDto); + } + + /** + * + * 申请入群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:00 + */ + @PostMapping("applyForGroup") + public Result applyForGroup(@LoginUser TokenDto userDetail, @RequestBody GroupApplyFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.applyForGroup(userDetail, formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java new file mode 100644 index 0000000..3034cf0 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -0,0 +1,222 @@ +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.epdc.form.EpdcUserGroupInviteFormDTO; +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.GroupDetailForMobileEndResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2020/5/12 13:19 + * @Description: 物业相关 + */ +@FeignClient(name = ServiceConstant.EPDC_GROUP_SERVER, fallback = GroupFeignClientFallback.class) +public interface PropertyFeignClient { + + /** + * + * 创建社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/17 14:44 + */ + @PostMapping(value = "group/epdc-app/group/create", consumes = MediaType.APPLICATION_JSON_VALUE) + Result createGroup(GroupCreateFormDTO formDto); + + /** + * + * 解散社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/21 9:54 + */ + @PostMapping(value = "group/epdc-app/group/operate", consumes = MediaType.APPLICATION_JSON_VALUE) + Result disbandGroup(GroupSettingStateDTO formDto); + + /** + * + * 我的群列表 + * + * @params [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/21 17:26 + */ + @GetMapping(value = "group/epdc-app/group/listOfMine", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listGroupsOfMine(GroupsOfMineFormDTO formDto); + + /** + * + * 推荐群列表 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/22 13:51 + */ + @GetMapping(value = "group/epdc-app/group/listOfRecommend", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listGroupsOfRecommend(GroupsOfMineFormDTO formDto); + + /** + * + * 社群详情 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 15:09 + */ + @GetMapping(value = "group/epdc-app/group/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result detail(GroupDetailForMobileEndFormDTO formDto); + + /** + * + * 修改群介绍 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 15:36 + */ + @PostMapping(value = "group/epdc-app/group/modifyIntroduction", consumes = MediaType.APPLICATION_JSON_VALUE) + Result modifyIntroduction(GroupIntroductionFormDTO formDto); + + /** + * + * 修改群头像 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 17:29 + */ + @PostMapping(value = "group/epdc-app/group/modifyAvatar", consumes = MediaType.APPLICATION_JSON_VALUE) + Result modifyAvatar(GroupModifyAvatarFormDTO formDto); + + /** + * + * 社群成员列表（待审核/审核通过） + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 9:16 + */ + @GetMapping(value = "group/epdc-app/group/listOfMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listOfMember(GroupUsersFormDTO formDto); + + /** + * + * 移除社群成员 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:47 + */ + @PostMapping(value = "group/epdc-app/group/removeMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result removeMember(GroupUserRemoveOrQuitFormDTO formDto); + + /** + * + * 退出社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:47 + */ + @PostMapping(value = "group/epdc-app/group/quitGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + Result quitGroup(GroupUserRemoveOrQuitFormDTO formDto); + + /** + * + * 添加成员列表 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/23 16:38 + */ + @GetMapping(value = "group/epdc-app/usergroup/getInviteList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getInviteList(EpdcUserGroupInviteFormDTO formDto); + + /** + * + * 添加成员 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 9:37 + */ + @PostMapping(value = "group/epdc-app/usergroup/addMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result addMember(GroupAddUserFormDTO formDto); + + /** + * + * 审核入群申请 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 13:26 + */ + @PostMapping(value = "group/epdc-app/usergroup/reviewApply", consumes = MediaType.APPLICATION_JSON_VALUE) + Result reviewApply(GroupUserReviewFormDTO formDto); + + /** + * + * 申请入群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:04 + */ + @PostMapping(value = "group/epdc-app/group/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + Result applyForGroup(GroupApplyFormDTO formDto); + + /** + * + * 更新社群用户党员标识并加入关联的所有网格党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:32 + */ + @PostMapping(value = "group/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); + + /** + * + * 用户加入党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 10:35 + */ + @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + Result joinGridPartyGroup(@RequestBody List formDto); +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java new file mode 100644 index 0000000..876874b --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -0,0 +1,108 @@ +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.epdc.form.EpdcUserGroupInviteFormDTO; +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.GroupDetailForMobileEndResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.feign.GroupFeignClient; +import com.elink.esua.epdc.feign.PropertyFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2020/5/12 13:19 + * @Description: 物业相关 + */ +@Component +public class PropertyFeignClientFallback implements PropertyFeignClient { + + @Override + public Result createGroup(GroupCreateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "createGroup", formDto); + } + + @Override + public Result disbandGroup(GroupSettingStateDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "disbandGroup", formDto); + } + + @Override + public Result> listGroupsOfMine(GroupsOfMineFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listGroupsOfMine", formDto); + } + + @Override + public Result> listGroupsOfRecommend(GroupsOfMineFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listGroupsOfRecommend", formDto); + } + + @Override + public Result detail(GroupDetailForMobileEndFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto); + } + + @Override + public Result modifyIntroduction(GroupIntroductionFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyIntroduction", formDto); + } + + @Override + public Result modifyAvatar(GroupModifyAvatarFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyAvatar", formDto); + } + + @Override + public Result> listOfMember(GroupUsersFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfMember", formDto); + } + + @Override + public Result removeMember(GroupUserRemoveOrQuitFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "removeMember", formDto); + } + + @Override + public Result quitGroup(GroupUserRemoveOrQuitFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "quitGroup", formDto); + } + + @Override + public Result> getInviteList(EpdcUserGroupInviteFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "getInviteList", formDto); + } + + @Override + public Result addMember(GroupAddUserFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "addMember", formDto); + } + + @Override + public Result reviewApply(GroupUserReviewFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "reviewApply", formDto); + } + + @Override + public Result applyForGroup(GroupApplyFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "applyForGroup", formDto); + } + + @Override + public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "updateUserPartyMember", formDto); + } + + @Override + public Result joinGridPartyGroup(List formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "joinGridPartyGroup", formDto); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java new file mode 100644 index 0000000..7eeb16c --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -0,0 +1,178 @@ +package com.elink.esua.epdc.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.epdc.form.EpdcUserGroupInviteFormDTO; +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.GroupDetailForMobileEndResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2020/5/12 13:21 + * @Description: 物先相关 + */ +public interface PropertyService { + + /** + * + * 创建社群 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/17 13:58 + */ + Result saveGroup(TokenDto userDetail, GroupCreateFormDTO formDto); + + /** + * + * 解散社群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/21 9:51 + */ + Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto); + + /** + * + * 我的群列表 + * + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/21 17:21 + */ + Result> listGroupsOfMine(TokenDto userDetail); + + /** + * + * 推荐群列表 + * + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/22 13:54 + */ + Result> listGroupsOfRecommend(TokenDto userDetail); + + /** + * + * 社群详情 + * + * @params [userDetail, id] + * @return com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO + * @author liuchuang + * @since 2019/10/22 15:15 + */ + Result getGroupDetail(TokenDto userDetail, String id); + + /** + * + * 修改群介绍 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 15:34 + */ + Result modifyIntroduction(TokenDto userDetail, GroupIntroductionFormDTO formDto); + + /** + * + * 修改群头像 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/22 17:26 + */ + Result modifyAvatar(TokenDto userDetail, GroupModifyAvatarFormDTO formDto); + + /** + * + * 社群成员列表（待审核/审核通过） + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 9:14 + */ + Result> listOfMember(GroupUsersFormDTO formDto); + + /** + * + * 移除社群成员 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:43 + */ + Result removeMember(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto); + + /** + * + * 退出社群 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/10/23 10:43 + */ + Result quitGroup(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto); + + /** + * + * 添加成员列表 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/10/23 16:40 + */ + Result> listOfInviteUsers(TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto); + + /** + * + * 添加社群成员 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 9:18 + */ + Result saveGroupUsers(GroupAddUserFormDTO formDto); + + /** + * + * 审核入群申请 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/6 13:23 + */ + Result updateGroupUsers(GroupUserReviewFormDTO formDto); + + /** + * + * 申请入群 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/11 14:02 + */ + Result applyForGroup(TokenDto userDetail, GroupApplyFormDTO formDto); + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java new file mode 100644 index 0000000..9f703b2 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -0,0 +1,201 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +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.enums.GroupStateEnum; +import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; +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.GroupSettingStateDTO; +import com.elink.esua.epdc.dto.group.form.*; +import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; +import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.GroupFeignClient; +import com.elink.esua.epdc.service.GroupService; +import com.elink.esua.epdc.service.PropertyService; +import com.elink.esua.epdc.utils.UserTagUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2020/5/12 13:23 + * @Description: 社群相关 + */ +@Service +public class PropertyServiceImpl implements PropertyService { + + @Autowired + private AdminFeignClient adminFeignClient; + + @Autowired + private GroupFeignClient groupFeignClient; + + @Override + public Result saveGroup(TokenDto userDetail, GroupCreateFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + //获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + formDto.setParentDeptIds(deptDTO.getParentDeptIds()); + formDto.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + formDto.setAllDeptIds(deptDTO.getAllDeptIds()); + formDto.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + formDto.setGrid(deptDTO.getGrid()); + formDto.setGridId(deptDTO.getGridId()); + formDto.setGroupCategory(NumConstant.ONE_STR); + formDto.setState(GroupStateEnum.GROUP_STATE_PENDING_REVIEW.getValue()); + // 群主信息 + GroupUserFormDTO groupUserFormDTO = new GroupUserFormDTO(); + groupUserFormDTO.setUserId(userDetail.getUserId()); + groupUserFormDTO.setNickname(userDetail.getNickname()); + groupUserFormDTO.setUserAvatar(userDetail.getFaceImg()); + groupUserFormDTO.setMobile(userDetail.getMobile()); + // 判断当前用户是否为党员 + if (!UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + return new Result().error("您当前身份不是党员，不能创建社群"); + } + groupUserFormDTO.setPartyMember(YesOrNoEnum.YES.value()); + groupUserFormDTO.setLordFlag(NumConstant.ONE_STR); + groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); + formDto.setGroupUserFormDTO(groupUserFormDTO); + + return groupFeignClient.createGroup(formDto); + } + + @Override + 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); + } + + @Override + public Result> listGroupsOfMine(TokenDto userDetail) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); + formDto.setUserId(userDetail.getUserId()); + formDto.setGridId(userDetail.getGridId()); + return groupFeignClient.listGroupsOfMine(formDto); + } + + @Override + public Result> listGroupsOfRecommend(TokenDto userDetail) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); + formDto.setUserId(userDetail.getUserId()); + formDto.setGridId(userDetail.getGridId()); + return groupFeignClient.listGroupsOfRecommend(formDto); + } + + @Override + public Result getGroupDetail(TokenDto userDetail, String id) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + GroupDetailForMobileEndFormDTO formDto = new GroupDetailForMobileEndFormDTO(); + formDto.setId(id); + formDto.setUserId(userDetail.getUserId()); + return groupFeignClient.detail(formDto); + } + + @Override + public Result modifyIntroduction(TokenDto userDetail, GroupIntroductionFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return groupFeignClient.modifyIntroduction(formDto); + } + + @Override + public Result modifyAvatar(TokenDto userDetail, GroupModifyAvatarFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return groupFeignClient.modifyAvatar(formDto); + } + + @Override + public Result> listOfMember(GroupUsersFormDTO formDto) { + return groupFeignClient.listOfMember(formDto); + } + + @Override + public Result removeMember(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setOperatorId(userDetail.getUserId()); + return groupFeignClient.removeMember(formDto); + } + + @Override + public Result quitGroup(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setOperatorId(userDetail.getUserId()); + formDto.setUserId(userDetail.getUserId()); + return groupFeignClient.quitGroup(formDto); + } + + @Override + public Result> listOfInviteUsers(TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setGridId(userDetail.getGridId()); + return groupFeignClient.getInviteList(formDto); + } + + @Override + public Result saveGroupUsers(GroupAddUserFormDTO formDto) { + return groupFeignClient.addMember(formDto); + } + + @Override + public Result updateGroupUsers(GroupUserReviewFormDTO formDto) { + return groupFeignClient.reviewApply(formDto); + } + + @Override + public Result applyForGroup(TokenDto userDetail, GroupApplyFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + formDto.setNickname(userDetail.getNickname()); + formDto.setUserAvatar(userDetail.getFaceImg()); + formDto.setMobile(userDetail.getMobile()); + if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + formDto.setPartyMember(YesOrNoEnum.YES.value()); + } else { + formDto.setPartyMember(YesOrNoEnum.NO.value()); + } + return groupFeignClient.applyForGroup(formDto); + } +} From c17782b310dc8ed0844a91873de8694b5379a90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 13:30:15 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/PropertyFeignClient.java | 32 +++++++++--------- .../service/impl/PropertyServiceImpl.java | 33 +++++++++---------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index 3034cf0..a912097 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -37,7 +37,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/17 14:44 */ - @PostMapping(value = "group/epdc-app/group/create", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/create", consumes = MediaType.APPLICATION_JSON_VALUE) Result createGroup(GroupCreateFormDTO formDto); /** @@ -49,7 +49,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/21 9:54 */ - @PostMapping(value = "group/epdc-app/group/operate", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/operate", consumes = MediaType.APPLICATION_JSON_VALUE) Result disbandGroup(GroupSettingStateDTO formDto); /** @@ -61,7 +61,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/21 17:26 */ - @GetMapping(value = "group/epdc-app/group/listOfMine", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "property/epdc-app/group/listOfMine", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listGroupsOfMine(GroupsOfMineFormDTO formDto); /** @@ -73,7 +73,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/22 13:51 */ - @GetMapping(value = "group/epdc-app/group/listOfRecommend", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "property/epdc-app/group/listOfRecommend", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listGroupsOfRecommend(GroupsOfMineFormDTO formDto); /** @@ -85,7 +85,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/22 15:09 */ - @GetMapping(value = "group/epdc-app/group/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "property/epdc-app/group/detail", consumes = MediaType.APPLICATION_JSON_VALUE) Result detail(GroupDetailForMobileEndFormDTO formDto); /** @@ -97,7 +97,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/22 15:36 */ - @PostMapping(value = "group/epdc-app/group/modifyIntroduction", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/modifyIntroduction", consumes = MediaType.APPLICATION_JSON_VALUE) Result modifyIntroduction(GroupIntroductionFormDTO formDto); /** @@ -109,7 +109,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/22 17:29 */ - @PostMapping(value = "group/epdc-app/group/modifyAvatar", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/modifyAvatar", consumes = MediaType.APPLICATION_JSON_VALUE) Result modifyAvatar(GroupModifyAvatarFormDTO formDto); /** @@ -121,7 +121,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/23 9:16 */ - @GetMapping(value = "group/epdc-app/group/listOfMember", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "property/epdc-app/group/listOfMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listOfMember(GroupUsersFormDTO formDto); /** @@ -133,7 +133,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/23 10:47 */ - @PostMapping(value = "group/epdc-app/group/removeMember", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/removeMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result removeMember(GroupUserRemoveOrQuitFormDTO formDto); /** @@ -145,7 +145,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/23 10:47 */ - @PostMapping(value = "group/epdc-app/group/quitGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/quitGroup", consumes = MediaType.APPLICATION_JSON_VALUE) Result quitGroup(GroupUserRemoveOrQuitFormDTO formDto); /** @@ -157,7 +157,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/10/23 16:38 */ - @GetMapping(value = "group/epdc-app/usergroup/getInviteList", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "property/epdc-app/usergroup/getInviteList", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getInviteList(EpdcUserGroupInviteFormDTO formDto); /** @@ -169,7 +169,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/11/6 9:37 */ - @PostMapping(value = "group/epdc-app/usergroup/addMember", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/usergroup/addMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result addMember(GroupAddUserFormDTO formDto); /** @@ -181,7 +181,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/11/6 13:26 */ - @PostMapping(value = "group/epdc-app/usergroup/reviewApply", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/usergroup/reviewApply", consumes = MediaType.APPLICATION_JSON_VALUE) Result reviewApply(GroupUserReviewFormDTO formDto); /** @@ -193,7 +193,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/11/11 14:04 */ - @PostMapping(value = "group/epdc-app/group/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE) Result applyForGroup(GroupApplyFormDTO formDto); /** @@ -205,7 +205,7 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/11/11 14:32 */ - @PostMapping(value = "group/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); /** @@ -217,6 +217,6 @@ public interface PropertyFeignClient { * @author liuchuang * @since 2019/11/21 10:35 */ - @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "property/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) Result joinGridPartyGroup(@RequestBody List formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index 9f703b2..d036782 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -17,8 +17,7 @@ import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; -import com.elink.esua.epdc.feign.GroupFeignClient; -import com.elink.esua.epdc.service.GroupService; +import com.elink.esua.epdc.feign.PropertyFeignClient; import com.elink.esua.epdc.service.PropertyService; import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +38,7 @@ public class PropertyServiceImpl implements PropertyService { private AdminFeignClient adminFeignClient; @Autowired - private GroupFeignClient groupFeignClient; + private PropertyFeignClient propertyFeignClient; @Override public Result saveGroup(TokenDto userDetail, GroupCreateFormDTO formDto) { @@ -75,7 +74,7 @@ public class PropertyServiceImpl implements PropertyService { groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); formDto.setGroupUserFormDTO(groupUserFormDTO); - return groupFeignClient.createGroup(formDto); + return propertyFeignClient.createGroup(formDto); } @Override @@ -85,7 +84,7 @@ public class PropertyServiceImpl implements PropertyService { } dto.setState(GroupStateEnum.GROUP_STATE_DISBANDED.getValue()); dto.setUserId(userDetail.getUserId()); - return groupFeignClient.disbandGroup(dto); + return propertyFeignClient.disbandGroup(dto); } @Override @@ -96,7 +95,7 @@ public class PropertyServiceImpl implements PropertyService { GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); formDto.setUserId(userDetail.getUserId()); formDto.setGridId(userDetail.getGridId()); - return groupFeignClient.listGroupsOfMine(formDto); + return propertyFeignClient.listGroupsOfMine(formDto); } @Override @@ -107,7 +106,7 @@ public class PropertyServiceImpl implements PropertyService { GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); formDto.setUserId(userDetail.getUserId()); formDto.setGridId(userDetail.getGridId()); - return groupFeignClient.listGroupsOfRecommend(formDto); + return propertyFeignClient.listGroupsOfRecommend(formDto); } @Override @@ -118,7 +117,7 @@ public class PropertyServiceImpl implements PropertyService { GroupDetailForMobileEndFormDTO formDto = new GroupDetailForMobileEndFormDTO(); formDto.setId(id); formDto.setUserId(userDetail.getUserId()); - return groupFeignClient.detail(formDto); + return propertyFeignClient.detail(formDto); } @Override @@ -127,7 +126,7 @@ public class PropertyServiceImpl implements PropertyService { return new Result().error("获取用户信息失败"); } formDto.setUserId(userDetail.getUserId()); - return groupFeignClient.modifyIntroduction(formDto); + return propertyFeignClient.modifyIntroduction(formDto); } @Override @@ -136,12 +135,12 @@ public class PropertyServiceImpl implements PropertyService { return new Result().error("获取用户信息失败"); } formDto.setUserId(userDetail.getUserId()); - return groupFeignClient.modifyAvatar(formDto); + return propertyFeignClient.modifyAvatar(formDto); } @Override public Result> listOfMember(GroupUsersFormDTO formDto) { - return groupFeignClient.listOfMember(formDto); + return propertyFeignClient.listOfMember(formDto); } @Override @@ -150,7 +149,7 @@ public class PropertyServiceImpl implements PropertyService { return new Result().error("获取用户信息失败"); } formDto.setOperatorId(userDetail.getUserId()); - return groupFeignClient.removeMember(formDto); + return propertyFeignClient.removeMember(formDto); } @Override @@ -160,7 +159,7 @@ public class PropertyServiceImpl implements PropertyService { } formDto.setOperatorId(userDetail.getUserId()); formDto.setUserId(userDetail.getUserId()); - return groupFeignClient.quitGroup(formDto); + return propertyFeignClient.quitGroup(formDto); } @Override @@ -169,17 +168,17 @@ public class PropertyServiceImpl implements PropertyService { return new Result().error("获取用户信息失败"); } formDto.setGridId(userDetail.getGridId()); - return groupFeignClient.getInviteList(formDto); + return propertyFeignClient.getInviteList(formDto); } @Override public Result saveGroupUsers(GroupAddUserFormDTO formDto) { - return groupFeignClient.addMember(formDto); + return propertyFeignClient.addMember(formDto); } @Override public Result updateGroupUsers(GroupUserReviewFormDTO formDto) { - return groupFeignClient.reviewApply(formDto); + return propertyFeignClient.reviewApply(formDto); } @Override @@ -196,6 +195,6 @@ public class PropertyServiceImpl implements PropertyService { } else { formDto.setPartyMember(YesOrNoEnum.NO.value()); } - return groupFeignClient.applyForGroup(formDto); + return propertyFeignClient.applyForGroup(formDto); } } From c5f1d02ba64fec0e3125b5e7aed3d8e94aad09da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 13:36:31 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/feign/PropertyFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index a912097..a9812e8 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -25,7 +25,7 @@ import java.util.List; * @Date: 2020/5/12 13:19 * @Description: 物业相关 */ -@FeignClient(name = ServiceConstant.EPDC_GROUP_SERVER, fallback = GroupFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_PROPERTY_SERVER, fallback = PropertyFeignClient.class) public interface PropertyFeignClient { /** From 01fa3f53b902c09efbe4ce4e35cc7938673b58fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 13:43:22 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/feign/PropertyFeignClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index a9812e8..7e7e67c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -11,6 +11,7 @@ import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.PropertyFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +26,7 @@ import java.util.List; * @Date: 2020/5/12 13:19 * @Description: 物业相关 */ -@FeignClient(name = ServiceConstant.EPDC_PROPERTY_SERVER, fallback = PropertyFeignClient.class) +@FeignClient(name = ServiceConstant.EPDC_PROPERTY_SERVER, fallback = PropertyFeignClientFallback.class) public interface PropertyFeignClient { /** From a4f1525f2cabb9cc10496c06e3a9caca50528137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 12 May 2020 14:27:55 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 185 +++++++++--------- .../esua/epdc/feign/PropertyFeignClient.java | 145 +++++++------- .../fallback/PropertyFeignClientFallback.java | 57 +++--- .../esua/epdc/service/PropertyService.java | 134 ++++++------- .../service/impl/PropertyServiceImpl.java | 151 +++++++------- 5 files changed, 329 insertions(+), 343 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index a48c196..982cf68 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -8,222 +8,219 @@ 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; -import com.elink.esua.epdc.service.GroupService; +import com.elink.esua.epdc.dto.group.result.*; +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.TopicListFormDTO; +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.service.PropertyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.List; /** - * @author: qushutong - * @Date: 2020/5/12 11:11 - * @Description: 物业相关 + * @author: qushutong + * @Date: 2020/5/12 11:11 + * @Description: 物业相关 */ @RestController -@RequestMapping("property/group") +@RequestMapping("property") public class ApiPropertyController { @Autowired private PropertyService propertyService; - /** - * - * 创建社群 - * - * @params [userDetail, formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/17 13:58 - */ - @PostMapping("create") - public Result createGroup(@LoginUser TokenDto userDetail, @RequestBody GroupCreateFormDTO formDto) { - return propertyService.saveGroup(userDetail, formDto); - } - - /** - * - * 解散社群 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/21 9:51 - */ - @PostMapping("disband") - public Result disbandGroup(@LoginUser TokenDto userDetail, @RequestBody GroupSettingStateDTO formDto) { - return propertyService.disbandGroup(userDetail, formDto); - } - - /** - * - * 我的群列表 - * - * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/21 17:20 - */ - @GetMapping("listOfMine") - public Result> groupsOfMine(@LoginUser TokenDto userDetail) { - return propertyService.listGroupsOfMine(userDetail); - } /** - * - * 推荐群列表 - * - * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/22 13:53 - */ - @GetMapping("listOfRecommend") - public Result> groupsOfRecommend(@LoginUser TokenDto userDetail) { - return propertyService.listGroupsOfRecommend(userDetail); - } - - /** - * * 社群详情 * + * @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 */ - @GetMapping("detail/{id}") + @GetMapping("group/detail/{id}") public Result detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) { return propertyService.getGroupDetail(userDetail, id); } /** - * * 修改群介绍 * - * @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") + @PostMapping("group/modifyIntroduction") public Result modifyIntroduction(@LoginUser TokenDto userDetail, @RequestBody GroupIntroductionFormDTO formDto) { return propertyService.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") + @PostMapping("group/modifyAvatar") public Result modifyAvatar(@LoginUser TokenDto userDetail, @RequestBody GroupModifyAvatarFormDTO formDto) { return propertyService.modifyAvatar(userDetail, formDto); } /** - * * 社群成员列表（待审核/审核通过） * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 9:13 */ - @GetMapping("listOfMember") + @GetMapping("group/listOfMember") public Result> listOfMember(GroupUsersFormDTO formDto) { return propertyService.listOfMember(formDto); } /** - * * 移除社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:35 */ - @PostMapping("removeMember") + @PostMapping("group/removeMember") public Result removeMember(@LoginUser TokenDto userDetail, @RequestBody GroupUserRemoveOrQuitFormDTO formDto) { return propertyService.removeMember(userDetail, formDto); } /** - * * 退出社群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:40 */ - @PostMapping("quitGroup") + @PostMapping("group/quitGroup") public Result quitGroup(@LoginUser TokenDto userDetail, @RequestBody GroupUserRemoveOrQuitFormDTO formDto) { return propertyService.quitGroup(userDetail, formDto); } /** - * * 添加成员列表 * + * @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 */ - @GetMapping("getInviteList") + @GetMapping("group/getInviteList") public Result> getInviteList(@LoginUser TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto) { return propertyService.listOfInviteUsers(userDetail, formDto); } /** - * * 添加社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 9:17 */ - @PostMapping("addMember") + @PostMapping("group/addMember") public Result addMember(@RequestBody GroupAddUserFormDTO formDto) { return propertyService.saveGroupUsers(formDto); } /** - * * 审核入群申请 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 13:22 */ - @PostMapping("reviewApply") + @PostMapping("group/reviewApply") public Result reviewApply(@RequestBody GroupUserReviewFormDTO formDto) { return propertyService.updateGroupUsers(formDto); } /** - * * 申请入群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/11 14:00 */ - @PostMapping("applyForGroup") + @PostMapping("group/applyForGroup") public Result applyForGroup(@LoginUser TokenDto userDetail, @RequestBody GroupApplyFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return propertyService.applyForGroup(userDetail, formDto); } + + + /** + * 发布话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/6 14:46 + */ + @PostMapping("topic/submit") + public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicSubmitFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.saveTopic(userDetail, formDto); + } + + /** + * 话题列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/11 15:04 + */ + @GetMapping("topic/list") + public Result> listTopic(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.listOfTopic(userDetail, formDto); + } + + + /** + * 话题详情 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [id] + * @author liuchuang + * @since 2019/11/7 15:37 + */ + @GetMapping("topic/detail/{id}") + public Result topicDetail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) { + return propertyService.getTopicDetailById(userDetail, id); + } + + /** + * 关闭话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author liuchuang + * @since 2019/11/7 16:10 + */ + @PostMapping("topic/close") + public Result close(@LoginUser TokenDto userDetail, @RequestBody TopicCloseFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.closeTopic(userDetail, formDto); + } + + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index 7e7e67c..cba53c6 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -6,15 +6,16 @@ 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.dto.group.result.*; +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.GroupFeignClientFallback; import com.elink.esua.epdc.feign.fallback.PropertyFeignClientFallback; 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 org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,67 +23,19 @@ import java.util.List; /** - * @author: qushutong - * @Date: 2020/5/12 13:19 - * @Description: 物业相关 + * @author: qushutong + * @Date: 2020/5/12 13:19 + * @Description: 物业相关 */ @FeignClient(name = ServiceConstant.EPDC_PROPERTY_SERVER, fallback = PropertyFeignClientFallback.class) public interface PropertyFeignClient { - /** - * - * 创建社群 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/17 14:44 - */ - @PostMapping(value = "property/epdc-app/group/create", consumes = MediaType.APPLICATION_JSON_VALUE) - Result createGroup(GroupCreateFormDTO formDto); /** - * - * 解散社群 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/21 9:54 - */ - @PostMapping(value = "property/epdc-app/group/operate", consumes = MediaType.APPLICATION_JSON_VALUE) - Result disbandGroup(GroupSettingStateDTO formDto); - - /** - * - * 我的群列表 - * - * @params [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/21 17:26 - */ - @GetMapping(value = "property/epdc-app/group/listOfMine", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listGroupsOfMine(GroupsOfMineFormDTO formDto); - - /** - * - * 推荐群列表 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/22 13:51 - */ - @GetMapping(value = "property/epdc-app/group/listOfRecommend", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listGroupsOfRecommend(GroupsOfMineFormDTO formDto); - - /** - * * 社群详情 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/22 15:09 */ @@ -90,11 +43,10 @@ public interface PropertyFeignClient { Result detail(GroupDetailForMobileEndFormDTO formDto); /** - * * 修改群介绍 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/22 15:36 */ @@ -102,11 +54,10 @@ public interface PropertyFeignClient { Result modifyIntroduction(GroupIntroductionFormDTO formDto); /** - * * 修改群头像 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/22 17:29 */ @@ -114,11 +65,10 @@ public interface PropertyFeignClient { Result modifyAvatar(GroupModifyAvatarFormDTO formDto); /** - * * 社群成员列表（待审核/审核通过） * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 9:16 */ @@ -126,11 +76,10 @@ public interface PropertyFeignClient { Result> listOfMember(GroupUsersFormDTO formDto); /** - * * 移除社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:47 */ @@ -138,11 +87,10 @@ public interface PropertyFeignClient { Result removeMember(GroupUserRemoveOrQuitFormDTO formDto); /** - * * 退出社群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 10:47 */ @@ -150,11 +98,10 @@ public interface PropertyFeignClient { Result quitGroup(GroupUserRemoveOrQuitFormDTO formDto); /** - * * 添加成员列表 * + * @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:38 */ @@ -162,11 +109,10 @@ public interface PropertyFeignClient { Result> getInviteList(EpdcUserGroupInviteFormDTO formDto); /** - * * 添加成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 9:37 */ @@ -174,11 +120,10 @@ public interface PropertyFeignClient { Result addMember(GroupAddUserFormDTO formDto); /** - * * 审核入群申请 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 13:26 */ @@ -186,11 +131,10 @@ public interface PropertyFeignClient { Result reviewApply(GroupUserReviewFormDTO formDto); /** - * * 申请入群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/11 14:04 */ @@ -198,11 +142,10 @@ public interface PropertyFeignClient { Result applyForGroup(GroupApplyFormDTO formDto); /** - * * 更新社群用户党员标识并加入关联的所有网格党员群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/11 14:32 */ @@ -210,14 +153,60 @@ public interface PropertyFeignClient { Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); /** - * * 用户加入党员群 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/21 10:35 */ @PostMapping(value = "property/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) Result joinGridPartyGroup(@RequestBody List formDto); + + + /** + * 发布话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author liuchuang + * @since 2019/11/6 15:40 + */ + @PostMapping(value = "property/epdc-app/topic/submit", consumes = MediaType.APPLICATION_JSON_VALUE) + Result submit(TopicSubmitFormDTO formDto); + + /** + * 话题详情 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [id] + * @author liuchuang + * @since 2019/11/7 15:37 + */ + @GetMapping(value = "property/epdc-app/topic/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result detail(TopicDetailFormDTO formDto); + + /** + * 话题列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [formDto] + * @author liuchuang + * @since 2019/11/11 15:06 + */ + @GetMapping(value = "property/epdc-app/topic/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listOfTopic(TopicListFormDTO formDto); + + /** + * 关闭话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author liuchuang + * @since 2019/11/7 16:14 + */ + @PostMapping(value = "property/epdc-app/topic/close", consumes = MediaType.APPLICATION_JSON_VALUE) + Result close(TopicCloseFormDTO formDto); + + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java index 876874b..b61f8e3 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -7,44 +7,26 @@ 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.dto.group.result.*; +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.GroupFeignClient; import com.elink.esua.epdc.feign.PropertyFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; /** - * @author: qushutong - * @Date: 2020/5/12 13:19 - * @Description: 物业相关 + * @author: qushutong + * @Date: 2020/5/12 13:19 + * @Description: 物业相关 */ @Component public class PropertyFeignClientFallback implements PropertyFeignClient { - @Override - public Result createGroup(GroupCreateFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "createGroup", formDto); - } - - @Override - public Result disbandGroup(GroupSettingStateDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "disbandGroup", formDto); - } - - @Override - public Result> listGroupsOfMine(GroupsOfMineFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listGroupsOfMine", formDto); - } - - @Override - public Result> listGroupsOfRecommend(GroupsOfMineFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listGroupsOfRecommend", formDto); - } @Override public Result detail(GroupDetailForMobileEndFormDTO formDto) { @@ -105,4 +87,27 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { public Result joinGridPartyGroup(List formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "joinGridPartyGroup", formDto); } + + + @Override + public Result submit(TopicSubmitFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", formDto); + } + + @Override + public Result detail(TopicDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto); + } + + @Override + public Result close(TopicCloseFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "close", formDto); + } + + + @Override + public Result> listOfTopic(TopicListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfTopic", formDto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index 7eeb16c..82aece0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -6,173 +6,167 @@ 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.dto.group.result.*; +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.TopicListFormDTO; +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 org.springframework.web.multipart.MultipartFile; import java.util.List; /** - * @author: qushutong - * @Date: 2020/5/12 13:21 - * @Description: 物先相关 + * @author: qushutong + * @Date: 2020/5/12 13:21 + * @Description: 物先相关 */ public interface PropertyService { - /** - * - * 创建社群 - * - * @params [userDetail, formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/17 13:58 - */ - Result saveGroup(TokenDto userDetail, GroupCreateFormDTO formDto); - - /** - * - * 解散社群 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/10/21 9:51 - */ - Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto); - - /** - * - * 我的群列表 - * - * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/21 17:21 - */ - Result> listGroupsOfMine(TokenDto userDetail); /** - * - * 推荐群列表 - * - * @params [userDetail] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2019/10/22 13:54 - */ - Result> listGroupsOfRecommend(TokenDto userDetail); - - /** - * * 社群详情 * - * @params [userDetail, id] * @return com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO + * @params [userDetail, id] * @author liuchuang * @since 2019/10/22 15:15 */ Result getGroupDetail(TokenDto userDetail, String id); /** - * * 修改群介绍 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/22 15:34 */ Result modifyIntroduction(TokenDto userDetail, GroupIntroductionFormDTO formDto); /** - * * 修改群头像 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/22 17:26 */ Result modifyAvatar(TokenDto userDetail, GroupModifyAvatarFormDTO formDto); /** - * * 社群成员列表（待审核/审核通过） * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/10/23 9:14 */ Result> listOfMember(GroupUsersFormDTO formDto); /** - * * 移除社群成员 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/23 10:43 */ Result removeMember(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto); /** - * * 退出社群 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/10/23 10:43 */ Result quitGroup(TokenDto userDetail, GroupUserRemoveOrQuitFormDTO formDto); /** - * * 添加成员列表 * + * @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:40 */ Result> listOfInviteUsers(TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto); /** - * * 添加社群成员 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 9:18 */ Result saveGroupUsers(GroupAddUserFormDTO formDto); /** - * * 审核入群申请 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/6 13:23 */ Result updateGroupUsers(GroupUserReviewFormDTO formDto); /** - * * 申请入群 * - * @params [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/11 14:02 */ Result applyForGroup(TokenDto userDetail, GroupApplyFormDTO formDto); + + /** + * 发布话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/6 14:51 + */ + Result saveTopic(TokenDto userDetail, TopicSubmitFormDTO formDto); + + /** + * 话题详情 + * + * @return com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO + * @params [id] + * @author liuchuang + * @since 2019/11/7 15:34 + */ + Result getTopicDetailById(TokenDto userDetail, String id); + + /** + * 关闭话题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/7 16:11 + */ + Result closeTopic(TokenDto userDetail, TopicCloseFormDTO formDto); + + + /** + * 话题列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/11 15:05 + */ + Result> listOfTopic(TokenDto userDetail, TopicListFormDTO formDto); + + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index d036782..bf35012 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -6,17 +6,20 @@ 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.UploadToOssDTO; import com.elink.esua.epdc.dto.enums.GroupStateEnum; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; +import com.elink.esua.epdc.dto.enums.TopicStateEnum; 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.dto.group.result.*; +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.AdminFeignClient; +import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.feign.PropertyFeignClient; import com.elink.esua.epdc.service.PropertyService; import com.elink.esua.epdc.utils.UserTagUtils; @@ -27,9 +30,9 @@ import java.util.List; /** - * @author: qushutong - * @Date: 2020/5/12 13:23 - * @Description: 社群相关 + * @author: qushutong + * @Date: 2020/5/12 13:23 + * @Description: 社群相关 */ @Service public class PropertyServiceImpl implements PropertyService { @@ -40,74 +43,6 @@ public class PropertyServiceImpl implements PropertyService { @Autowired private PropertyFeignClient propertyFeignClient; - @Override - public Result saveGroup(TokenDto userDetail, GroupCreateFormDTO formDto) { - if (null == userDetail) { - return new Result().error("获取用户信息失败"); - } - //获取所有上级机构名称和ID拼接 - Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); - ParentAndAllDeptDTO deptDTO = dtoResult.getData(); - // 父所有部门 - formDto.setParentDeptIds(deptDTO.getParentDeptIds()); - formDto.setParentDeptNames(deptDTO.getParentDeptNames()); - // 所有部门 - formDto.setAllDeptIds(deptDTO.getAllDeptIds()); - formDto.setAllDeptNames(deptDTO.getAllDeptNames()); - // 网格 - formDto.setGrid(deptDTO.getGrid()); - formDto.setGridId(deptDTO.getGridId()); - formDto.setGroupCategory(NumConstant.ONE_STR); - formDto.setState(GroupStateEnum.GROUP_STATE_PENDING_REVIEW.getValue()); - // 群主信息 - GroupUserFormDTO groupUserFormDTO = new GroupUserFormDTO(); - groupUserFormDTO.setUserId(userDetail.getUserId()); - groupUserFormDTO.setNickname(userDetail.getNickname()); - groupUserFormDTO.setUserAvatar(userDetail.getFaceImg()); - groupUserFormDTO.setMobile(userDetail.getMobile()); - // 判断当前用户是否为党员 - if (!UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - return new Result().error("您当前身份不是党员，不能创建社群"); - } - groupUserFormDTO.setPartyMember(YesOrNoEnum.YES.value()); - groupUserFormDTO.setLordFlag(NumConstant.ONE_STR); - groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); - formDto.setGroupUserFormDTO(groupUserFormDTO); - - return propertyFeignClient.createGroup(formDto); - } - - @Override - 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 propertyFeignClient.disbandGroup(dto); - } - - @Override - public Result> listGroupsOfMine(TokenDto userDetail) { - if (null == userDetail) { - return new Result().error("获取用户信息失败"); - } - GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); - formDto.setUserId(userDetail.getUserId()); - formDto.setGridId(userDetail.getGridId()); - return propertyFeignClient.listGroupsOfMine(formDto); - } - - @Override - public Result> listGroupsOfRecommend(TokenDto userDetail) { - if (null == userDetail) { - return new Result().error("获取用户信息失败"); - } - GroupsOfMineFormDTO formDto = new GroupsOfMineFormDTO(); - formDto.setUserId(userDetail.getUserId()); - formDto.setGridId(userDetail.getGridId()); - return propertyFeignClient.listGroupsOfRecommend(formDto); - } @Override public Result getGroupDetail(TokenDto userDetail, String id) { @@ -197,4 +132,70 @@ public class PropertyServiceImpl implements PropertyService { } return propertyFeignClient.applyForGroup(formDto); } + + + @Override + public Result saveTopic(TokenDto userDetail, TopicSubmitFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + //获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + formDto.setParentDeptIds(deptDTO.getParentDeptIds()); + formDto.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + formDto.setAllDeptIds(deptDTO.getAllDeptIds()); + formDto.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + formDto.setGrid(deptDTO.getGrid()); + formDto.setGridId(deptDTO.getGridId()); + + formDto.setUserId(userDetail.getUserId()); + formDto.setUserFace(userDetail.getFaceImg()); + formDto.setNickname(userDetail.getNickname()); + if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + formDto.setPartyMember(YesOrNoEnum.YES.value()); + } else { + formDto.setPartyMember(YesOrNoEnum.NO.value()); + } + formDto.setMobile(userDetail.getMobile()); + formDto.setState(TopicStateEnum.TOPIC_STATE_IN_CONVERSATION.getValue()); + + return propertyFeignClient.submit(formDto); + } + + @Override + public Result getTopicDetailById(TokenDto userDetail, String id) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + TopicDetailFormDTO formDto = new TopicDetailFormDTO(); + formDto.setId(id); + formDto.setUserId(userDetail.getUserId()); + return propertyFeignClient.detail(formDto); + } + + @Override + public Result closeTopic(TokenDto userDetail, TopicCloseFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return propertyFeignClient.close(formDto); + } + + + @Override + public Result> listOfTopic(TokenDto userDetail, TopicListFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setGridId(userDetail.getGridId()); + formDto.setCurrentUserId(userDetail.getUserId()); + return propertyFeignClient.listOfTopic(formDto); + } + + } From a50f8f45b0cdab57d4a55ea4bf5ea974b26435c5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 13 May 2020 18:16:13 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BB=A5=E5=8F=8A=E5=88=97=E8=A1=A8api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-api/pom.xml | 6 ++++ .../controller/ApiPropertyController.java | 32 +++++++++++++++++-- .../esua/epdc/feign/PropertyFeignClient.java | 28 ++++++++++++++-- .../esua/epdc/service/PropertyService.java | 21 ++++++++++++ .../service/impl/PropertyServiceImpl.java | 24 ++++++++++++++ 5 files changed, 106 insertions(+), 5 deletions(-) diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index 0e29977..5c2b571 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -100,6 +100,12 @@ epdc-commons-api-version-control ${epdc-cloud-commons.version} + + com.esua.epdc.yushan + epdc-cloud-property-client + 1.0.0 + compile + diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 982cf68..5a59c5b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -9,6 +9,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.dto.project.form.ProjectListFormDTO; 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.TopicListFormDTO; @@ -37,7 +38,7 @@ public class ApiPropertyController { /** * 社群详情 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, id] * @author liuchuang * @since 2019/10/22 15:14 @@ -115,7 +116,7 @@ public class ApiPropertyController { /** * 添加成员列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/10/23 16:39 @@ -183,7 +184,7 @@ public class ApiPropertyController { /** * 话题列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/11 15:04 @@ -222,5 +223,30 @@ public class ApiPropertyController { return propertyService.closeTopic(userDetail, formDto); } + /** + * 物业项目列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author zhangyuan + * @since 2020/5/13 16:10 + */ + @PostMapping("projectList") + public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.projectList(userDetail, formDto); + } + /** + * 物业项目详情 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author zhangyuan + * @since 2020/5/13 16:10 + */ + @PostMapping("projectDetail/{propertyProjectId}") + public Result projectDetail(@LoginUser TokenDto userDetail, @PathVariable("propertyProjectId") String propertyProjectId) { + return propertyService.projectDetail(userDetail, propertyProjectId); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index cba53c6..04cd9b0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -7,6 +7,10 @@ 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.dto.project.form.ProjectDetailFormDTO; +import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; +import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; +import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; 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; @@ -100,7 +104,7 @@ public interface PropertyFeignClient { /** * 添加成员列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/10/23 16:38 @@ -189,7 +193,7 @@ public interface PropertyFeignClient { /** * 话题列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/11/11 15:06 @@ -208,5 +212,25 @@ public interface PropertyFeignClient { @PostMapping(value = "property/epdc-app/topic/close", consumes = MediaType.APPLICATION_JSON_VALUE) Result close(TopicCloseFormDTO formDto); + /** + * 物业项目列表 + * + * @return ProjectListResultDTO + * @params [formDto] + * @author ZHANGYUAN + * @since 2020/5/13 15:06 + */ + @GetMapping(value = "property/epdc-app/project/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> projectList(ProjectListFormDTO formDto); + /** + * 物业项目详情 + * + * @return ProjectDetailResultDTO + * @params [formDto] + * @author ZHANGYUAN + * @since 2020/5/13 15:06 + */ + @GetMapping(value = "property/epdc-app/project/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> projectDetail(ProjectDetailFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index 82aece0..cdccdf1 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -7,6 +7,9 @@ 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.dto.project.form.ProjectListFormDTO; +import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; +import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; 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.TopicListFormDTO; @@ -168,5 +171,23 @@ public interface PropertyService { */ Result> listOfTopic(TokenDto userDetail, TopicListFormDTO formDto); + /** + * 物业项目列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/11 15:05 + */ + Result> projectList(TokenDto userDetail, ProjectListFormDTO formDto); + /** + * 物业项目详情 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/11/11 15:05 + */ + Result> projectDetail(TokenDto userDetail, String id); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index bf35012..8962d3a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -15,6 +15,10 @@ 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.dto.project.form.ProjectDetailFormDTO; +import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; +import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; +import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; 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; @@ -197,5 +201,25 @@ public class PropertyServiceImpl implements PropertyService { return propertyFeignClient.listOfTopic(formDto); } + @Override + public Result> projectList(TokenDto userDetail, ProjectListFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + formDto.setGridId(userDetail.getGridId()); + return propertyFeignClient.projectList(formDto); + } + @Override + public Result> projectDetail(TokenDto userDetail, String id) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + ProjectDetailFormDTO formDto = new ProjectDetailFormDTO(); + formDto.setId(id); + formDto.setUserId(userDetail.getUserId()); + formDto.setGridId(userDetail.getGridId()); + return propertyFeignClient.projectDetail(formDto); + } } From b1e12b3b8ab6d50db5af0b438a8a03b727581cf5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 14 May 2020 10:25:18 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=BA=E4=BB=8Epost?= =?UTF-8?q?=E6=94=B9=E4=B8=BAget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiPropertyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 5a59c5b..d94a17a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -231,7 +231,7 @@ public class ApiPropertyController { * @author zhangyuan * @since 2020/5/13 16:10 */ - @PostMapping("projectList") + @GetMapping("projectList") public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return propertyService.projectList(userDetail, formDto); @@ -245,7 +245,7 @@ public class ApiPropertyController { * @author zhangyuan * @since 2020/5/13 16:10 */ - @PostMapping("projectDetail/{propertyProjectId}") + @GetMapping("projectDetail/{propertyProjectId}") public Result projectDetail(@LoginUser TokenDto userDetail, @PathVariable("propertyProjectId") String propertyProjectId) { return propertyService.projectDetail(userDetail, propertyProjectId); } From 86d65992f0f7dcbeae6d9e6ac4a94f1968591a66 Mon Sep 17 00:00:00 2001 From: yujt Date: Thu, 14 May 2020 10:53:14 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-api/pom.xml | 13 +++++-------- .../esua/epdc/controller/ApiPropertyController.java | 2 +- .../feign/fallback/PropertyFeignClientFallback.java | 13 +++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index 5c2b571..080a880 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -228,7 +228,7 @@ true 47.104.224.45:8848 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + de000340-5fc4-45aa-bdbc-dd96852012ad wx3ef8f2cd12a19fcb @@ -236,14 +236,11 @@ 111 111 - - - - wx5d3e97461d248397 - bfed51b731e53db9affb9e6131e7ae12 + wx50ebeb95943868cd + c2719c261fe87b3e2d572552d2c8275d - wx9f20a46906ab2c3e - dc13065f79429979d9f687d249eb5c4e + wx6d45fd2f4dfe7ce4 + 54a30a48b100bbad20d7823cd9e1fb17 wxfa4afaa2b5f9c876 7db9f049c78c9a6cafa673deebe8330d diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index d94a17a..3fb2f7f 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -232,7 +232,7 @@ public class ApiPropertyController { * @since 2020/5/13 16:10 */ @GetMapping("projectList") - public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) { + public Result projectList(@LoginUser TokenDto userDetail, ProjectListFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return propertyService.projectList(userDetail, formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java index b61f8e3..6aed97e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -8,6 +8,10 @@ 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.dto.project.form.ProjectDetailFormDTO; +import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; +import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; +import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; 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; @@ -110,4 +114,13 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfTopic", formDto); } + @Override + public Result> projectList(ProjectListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectList", formDto); + } + + @Override + public Result> projectDetail(ProjectDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectDetail", formDto); + } } From 32ff13209a35906e524d046270110baa2ee6d47a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 14 May 2020 14:24:39 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8D=E5=86=8D=E6=98=AFlist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/service/PropertyService.java | 2 +- .../com/elink/esua/epdc/service/impl/PropertyServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index cdccdf1..f99a9c9 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -189,5 +189,5 @@ public interface PropertyService { * @author liuchuang * @since 2019/11/11 15:05 */ - Result> projectDetail(TokenDto userDetail, String id); + Result projectDetail(TokenDto userDetail, String id); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index 8962d3a..a943e10 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -212,7 +212,7 @@ public class PropertyServiceImpl implements PropertyService { } @Override - public Result> projectDetail(TokenDto userDetail, String id) { + public Result projectDetail(TokenDto userDetail, String id) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } From c3a4f93af196a42f826cac6a3568e53794c9b5b8 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 14 May 2020 14:54:17 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86feign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/PropertyFeignClient.java | 2 +- .../fallback/PropertyFeignClientFallback.java | 38 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index 04cd9b0..7217a69 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -232,5 +232,5 @@ public interface PropertyFeignClient { * @since 2020/5/13 15:06 */ @GetMapping(value = "property/epdc-app/project/detail", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> projectDetail(ProjectDetailFormDTO formDto); + Result projectDetail(ProjectDetailFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java index 6aed97e..fdf27d7 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -34,93 +34,93 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { @Override public Result detail(GroupDetailForMobileEndFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "detail", formDto); } @Override public Result modifyIntroduction(GroupIntroductionFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyIntroduction", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "modifyIntroduction", formDto); } @Override public Result modifyAvatar(GroupModifyAvatarFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyAvatar", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "modifyAvatar", formDto); } @Override public Result> listOfMember(GroupUsersFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfMember", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listOfMember", formDto); } @Override public Result removeMember(GroupUserRemoveOrQuitFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "removeMember", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "removeMember", formDto); } @Override public Result quitGroup(GroupUserRemoveOrQuitFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "quitGroup", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "quitGroup", formDto); } @Override public Result> getInviteList(EpdcUserGroupInviteFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "getInviteList", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "getInviteList", formDto); } @Override public Result addMember(GroupAddUserFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "addMember", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "addMember", formDto); } @Override public Result reviewApply(GroupUserReviewFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "reviewApply", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "reviewApply", formDto); } @Override public Result applyForGroup(GroupApplyFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "applyForGroup", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "applyForGroup", formDto); } @Override public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "updateUserPartyMember", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "updateUserPartyMember", formDto); } @Override public Result joinGridPartyGroup(List formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "joinGridPartyGroup", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "joinGridPartyGroup", formDto); } @Override public Result submit(TopicSubmitFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submit", formDto); } @Override public Result detail(TopicDetailFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "detail", formDto); } @Override public Result close(TopicCloseFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "close", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "close", formDto); } @Override public Result> listOfTopic(TopicListFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfTopic", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listOfTopic", formDto); } @Override public Result> projectList(ProjectListFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectList", formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectList", formDto); } @Override - public Result> projectDetail(ProjectDetailFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectDetail", formDto); + public Result projectDetail(ProjectDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectDetail", formDto); } } From 0256fb59cd826a8ebd9c96b096490453440e5bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 14 May 2020 16:54:55 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=85=88=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 33 ++++++++++-- .../esua/epdc/feign/PropertyFeignClient.java | 18 +++++-- .../fallback/PropertyFeignClientFallback.java | 18 +++++++ .../esua/epdc/service/PropertyService.java | 32 ++++++++--- .../service/impl/PropertyServiceImpl.java | 53 ++++++++++++++++--- 5 files changed, 134 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 3fb2f7f..000507b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -4,13 +4,15 @@ 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.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.dto.epdc.form.EpdcUserGroupInviteFormDTO; 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.dto.project.form.ProjectListFormDTO; -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.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; @@ -19,7 +21,6 @@ import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.service.PropertyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -249,4 +250,30 @@ public class ApiPropertyController { public Result projectDetail(@LoginUser TokenDto userDetail, @PathVariable("propertyProjectId") String propertyProjectId) { return propertyService.projectDetail(userDetail, propertyProjectId); } + + /** + * @author: qushutong + * @Date: 2020/5/14 16:48 + * @Description:提交评论或回复接口 + */ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { + return propertyService.submit(userDetail, topicCommentFormDTO); + } + + /** + * 评论（赞/踩） + */ + @PostMapping("statement") + public Result statement(@LoginUser TokenDto userDetail, @RequestBody TopicCommentStatementFormDTO topicCommentStatementFormDTO) { + return propertyService.statement(userDetail, topicCommentStatementFormDTO); + } + + /** + * 评论列表 + */ + @GetMapping("list") + public Result listOfComments(@LoginUser TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) { + return propertyService.listOfComments(userDetail, topicCommentsFormDTO); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index 7217a69..a35bcc2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -2,9 +2,12 @@ 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.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.dto.epdc.form.EpdcUserGroupInviteFormDTO; 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.dto.project.form.ProjectDetailFormDTO; @@ -14,12 +17,10 @@ import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; 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.GroupFeignClientFallback; import com.elink.esua.epdc.feign.fallback.PropertyFeignClientFallback; 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 org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -225,7 +226,6 @@ public interface PropertyFeignClient { /** * 物业项目详情 - * * @return ProjectDetailResultDTO * @params [formDto] * @author ZHANGYUAN @@ -233,4 +233,14 @@ public interface PropertyFeignClient { */ @GetMapping(value = "property/epdc-app/project/detail", consumes = MediaType.APPLICATION_JSON_VALUE) Result projectDetail(ProjectDetailFormDTO formDto); + + @PostMapping(value = "property/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE) + Result submit(TopicCommentFormDTO commentFormDTO); + + @PostMapping(value = "property/epdc-app/comment/statement", consumes = MediaType.APPLICATION_JSON_VALUE) + Result statement(TopicCommentStatementFormDTO commentStatementFormDTO); + + @GetMapping(value = "property/epdc-app/comment/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result listOfComments(TopicCommentsFormDTO formDto); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java index fdf27d7..aeb299d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -3,6 +3,10 @@ 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.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.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.GroupSettingStateDTO; @@ -123,4 +127,18 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { public Result projectDetail(ProjectDetailFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectDetail", formDto); } + public Result submit(TopicCommentFormDTO commentFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO); + } + + @Override + public Result statement(TopicCommentStatementFormDTO commentStatementFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "statement", commentStatementFormDTO); + } + + @Override + public Result listOfComments(TopicCommentsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfComments", formDto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index f99a9c9..9cfdc9e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -1,22 +1,24 @@ 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.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.dto.epdc.form.EpdcUserGroupInviteFormDTO; 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.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; -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.TopicListFormDTO; 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 org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -92,7 +94,7 @@ public interface PropertyService { /** * 添加成员列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [formDto] * @author liuchuang * @since 2019/10/23 16:40 @@ -164,7 +166,7 @@ public interface PropertyService { /** * 话题列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/11 15:05 @@ -174,7 +176,7 @@ public interface PropertyService { /** * 物业项目列表 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/11 15:05 @@ -184,10 +186,26 @@ public interface PropertyService { /** * 物业项目详情 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] * @author liuchuang * @since 2019/11/11 15:05 */ Result projectDetail(TokenDto userDetail, String id); + + /** + * 提交评论或回复接口 + */ + Result submit(@LoginUser TokenDto userDetail, TopicCommentFormDTO topicCommentFormDTO); + + /** + * 评论（赞/踩） + */ + Result statement(@LoginUser TokenDto userDetail, TopicCommentStatementFormDTO topicCommentStatementFormDTO); + + + /** + * 评论列表 + */ + Result listOfComments(TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index a943e10..1d0dc19 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -1,18 +1,18 @@ package com.elink.esua.epdc.service.impl; +import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; 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.UploadToOssDTO; -import com.elink.esua.epdc.dto.enums.GroupStateEnum; -import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; +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.dto.enums.TopicStateEnum; 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.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; import com.elink.esua.epdc.dto.group.result.*; import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; @@ -23,7 +23,6 @@ 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.AdminFeignClient; -import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.feign.PropertyFeignClient; import com.elink.esua.epdc.service.PropertyService; import com.elink.esua.epdc.utils.UserTagUtils; @@ -48,6 +47,10 @@ public class PropertyServiceImpl implements PropertyService { private PropertyFeignClient propertyFeignClient; + @Autowired + private WxMaSecCheckTask wxMaSecCheckTask; + + @Override public Result getGroupDetail(TokenDto userDetail, String id) { if (null == userDetail) { @@ -222,4 +225,42 @@ public class PropertyServiceImpl implements PropertyService { formDto.setGridId(userDetail.getGridId()); return propertyFeignClient.projectDetail(formDto); } + + @Override + public Result submit(TokenDto userDetail, TopicCommentFormDTO topicCommentFormDTO) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + // 上传内容安全检查 + wxMaSecCheckTask.checkMessage(topicCommentFormDTO.getContent()); + topicCommentFormDTO.setUserId(userDetail.getUserId()); + topicCommentFormDTO.setUserName(userDetail.getNickname()); + topicCommentFormDTO.setUserFace(userDetail.getFaceImg()); + if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); + } else { + topicCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); + } + return propertyFeignClient.submit(topicCommentFormDTO); + } + + @Override + public Result statement(TokenDto userDetail, TopicCommentStatementFormDTO topicCommentStatementFormDTO) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + topicCommentStatementFormDTO.setUseId(userDetail.getUserId()); + topicCommentStatementFormDTO.setUserName(userDetail.getNickname()); + return propertyFeignClient.statement(topicCommentStatementFormDTO); + } + + @Override + public Result listOfComments(TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + topicCommentsFormDTO.setUserId(userDetail.getUserId()); + return propertyFeignClient.listOfComments(topicCommentsFormDTO); + } + } From 28991bc2e0703565b36ff211b3570a391441f33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 14 May 2020 17:42:03 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiPropertyController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 000507b..79034bf 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -256,7 +256,7 @@ public class ApiPropertyController { * @Date: 2020/5/14 16:48 * @Description:提交评论或回复接口 */ - @PostMapping("submit") + @PostMapping("comment/submit") public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { return propertyService.submit(userDetail, topicCommentFormDTO); } @@ -264,7 +264,7 @@ public class ApiPropertyController { /** * 评论（赞/踩） */ - @PostMapping("statement") + @PostMapping("comment/statement") public Result statement(@LoginUser TokenDto userDetail, @RequestBody TopicCommentStatementFormDTO topicCommentStatementFormDTO) { return propertyService.statement(userDetail, topicCommentStatementFormDTO); } @@ -272,7 +272,7 @@ public class ApiPropertyController { /** * 评论列表 */ - @GetMapping("list") + @GetMapping("comment/list") public Result listOfComments(@LoginUser TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) { return propertyService.listOfComments(userDetail, topicCommentsFormDTO); } From db637ff9abd2fc729cc39236df2168a8ea130de7 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 18 May 2020 15:08:10 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-api=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiActPhraseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java index 0a563cd..0d3ef0a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java @@ -26,7 +26,7 @@ public class ApiActPhraseController { * @date 2019/12/13 14:41 */ @PostMapping("sagenumAddOne") - public Result sagenumAddOneById(String id) { + public Result sagenumAddOneById(@RequestBody String id) { return actPhraseService.sagenumAddOneById(id); } From e7e5910f0e7902092cd2e9dd9ae81b88c3ff8d22 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 18 May 2020 16:31:41 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiPropertyController.java | 15 +++++++++++++++ .../elink/esua/epdc/service/PropertyService.java | 11 +++++++++++ .../epdc/service/impl/PropertyServiceImpl.java | 10 ++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 79034bf..6519e9e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -276,4 +276,19 @@ public class ApiPropertyController { public Result listOfComments(@LoginUser TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) { return propertyService.listOfComments(userDetail, topicCommentsFormDTO); } + + /** + * + * 我的话题列表 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/11 15:04 + */ + @GetMapping("topic/listOfMine") + public Result> listTopicOfMine(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.listTopicOfMine(userDetail, formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index 9cfdc9e..71e24c5 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -208,4 +208,15 @@ public interface PropertyService { * 评论列表 */ Result listOfComments(TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO); + + /** + * + * 我的话题列表 + * + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/11 15:50 + */ + Result> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index 1d0dc19..ec71333 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -46,11 +46,9 @@ public class PropertyServiceImpl implements PropertyService { @Autowired private PropertyFeignClient propertyFeignClient; - @Autowired private WxMaSecCheckTask wxMaSecCheckTask; - @Override public Result getGroupDetail(TokenDto userDetail, String id) { if (null == userDetail) { @@ -263,4 +261,12 @@ public class PropertyServiceImpl implements PropertyService { return propertyFeignClient.listOfComments(topicCommentsFormDTO); } + @Override + public Result> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return propertyFeignClient.listOfTopic(formDto); + } }