查询群邀请信息添加进网格操作

epmet-module/resi-group/resi-group-server/pom.xml

@@ -88,6 +88,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-guide-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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<UserInfoOnEnterGridResultDTO> enterGrid(@RequestBody UserEnterGridFormDTO userEnterGridFormDTO);
+}

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<UserInfoOnEnterGridResultDTO> enterGrid(UserEnterGridFormDTO userEnterGridFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GUIDE_SERVER,"enterGrid",userEnterGridFormDTO);
+
+    }
+}
+

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<GroupInvitationD
 
 	@Autowired
 	private EpmetUserFeignClient epmetUserFeignClient;
+	@Autowired
+	private ResiGuideFeignClient resiGuideFeignClient;
 
 	@Override
 	public PageData<GroupInvitationDTO> page(Map<String, Object> params) {
@@ -212,6 +217,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		linkGroupInfoResultDTO.setGroupInfo(groupInfo);
 		//4、记录用户邀请关系
 		this.saveUserInvitation(groupInvitationDTO,formDTO);
+		UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
+		userEnterGridFormDTO.setCustomerId(groupInfo.getCustomerId());
+		userEnterGridFormDTO.setGridId(groupInfo.getGridId());
+		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
+		if(!result.success()){
+			logger.error("进入网格失败"+result.getMsg());
+		}
 		return linkGroupInfoResultDTO;
 	}
 

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<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
-
+        logger.info("进网格TokenDto:"+ JSON.toJSON(token));
         ValidatorUtils.validateEntity(userEnterGridFormDTO);
 
         return userAccessService.enterGrid(token,userEnterGridFormDTO);