From 9454eada6a7708d54b6fd7a7de5a9159563e5faf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 May 2020 15:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BE=A4=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E8=BF=9B=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/pom.xml | 6 +++++ .../modules/feign/ResiGuideFeignClient.java | 23 ++++++++++++++++ .../ResiGuideFeignClientFallback.java | 26 +++++++++++++++++++ .../impl/GroupInvitationServiceImpl.java | 12 +++++++++ .../epmet/controller/UserGuideController.java | 7 +++-- 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index c141ba8898..baddf63009 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -88,6 +88,12 @@ 2.0.0 compile + + com.epmet + resi-guide-client + 2.0.0 + compile + diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java new file mode 100644 index 0000000000..e72f454d3d --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java @@ -0,0 +1,23 @@ +package com.epmet.modules.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.modules.feign.fallback.ResiGuideFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @Description TODO + * @Author yinzuomei + * @Date 2020/5/18 15:13 + */ +//,url = "http://localhost:8091" +@FeignClient(name = ServiceConstant.RESI_GUIDE_SERVER, fallback = ResiGuideFeignClientFallback.class) +public interface ResiGuideFeignClient { + + @PostMapping("/resi/guide/user/entergrid") + Result enterGrid(@RequestBody UserEnterGridFormDTO userEnterGridFormDTO); +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java new file mode 100644 index 0000000000..0dcf2567b1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java @@ -0,0 +1,26 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.modules.feign.ResiGuideFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description TODO + * @Author yinzuomei + * @Date 2020/5/18 15:14 + */ +@Component +public class ResiGuideFeignClientFallback implements ResiGuideFeignClient { + + + @Override + public Result enterGrid(UserEnterGridFormDTO userEnterGridFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GUIDE_SERVER,"enterGrid",userEnterGridFormDTO); + + } +} + diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 92f2ebbd6f..82fc088a2a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -27,13 +27,16 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserEnterGridFormDTO; import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.feign.ResiGuideFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.service.ResiGroupService; @@ -96,6 +99,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl page(Map params) { @@ -212,6 +217,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO); + if(!result.success()){ + logger.error("进入网格失败"+result.getMsg()); + } return linkGroupInfoResultDTO; } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java index fe4d4d15ea..42920ff788 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -7,6 +8,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.UserEnterGridFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.service.UserAccessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,13 +25,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("user") public class UserGuideController { - + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private UserAccessService userAccessService; @PostMapping("entergrid") Result enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){ - + logger.info("进网格TokenDto:"+ JSON.toJSON(token)); ValidatorUtils.validateEntity(userEnterGridFormDTO); return userAccessService.enterGrid(token,userEnterGridFormDTO);