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] =?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); } }