进入网格相关代码2

epmet-gateway/src/main/resources/bootstrap.yml

@@ -274,6 +274,7 @@ epmet:
     - /gov/org/**
     - /oper/access/**
     - /resi/guide/stranger/getgridhome
+    - /resi/guide/user/entergrid
     - /auth/login/logout
     - /resi/mine/**
     - /resi/group/**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -97,7 +97,7 @@ public class CustomerGridController {
     /**
      * 供epmet-user服务调用 查询客户网格表数据
      * @author  sun
-     * @param formDTO
+     * @param customerGridFormDTO
      * @return
      * @throws Exception
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -60,5 +60,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<CustomerGridForStrangerResultDTO> selectRestGridWithoutGivenAreaCode(Map<String,Object> paramsMap);
 
-    CustomerGridDTO selectCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
+    CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -149,7 +149,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     @Override
     public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) {
-        return new Result<CustomerGridDTO>().ok(baseDao.selectCustomerGridByGridId(customerGridFormDTO));
+        return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(customerGridFormDTO));
 }
 
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java

@@ -6,6 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,13 +23,15 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("user")
 public class UserGuideController {
 
+    @Autowired
+    private UserAccessService userAccessService;
 
     @PostMapping("entergrid")
     Result<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
 
         ValidatorUtils.validateEntity(userEnterGridFormDTO);
 
-        return null;
+        return userAccessService.enterGrid(token,userEnterGridFormDTO);
     }
 
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -33,7 +33,7 @@ public interface EpmetUserFeignClient {
 	 * @Author wangc
 	 * @Date 2020.03.30 15:06
 	 **/
-	@PostMapping("getuserinfoandroles")
+	@PostMapping("/epmetuser/registerrelation/getuserinfoandroles")
 	Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(@RequestBody EnterGridFormDTO enterGridFormDTO);
 
 

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -3,7 +3,9 @@ package com.epmet.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.EnterGridFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -20,5 +22,10 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "savevisitedrecord",formDTO);
 	}
 
+	@Override
+	public Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getuserinfoandroles",enterGridFormDTO);
+	}
+
 
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/UserAccessService.java

@@ -11,6 +11,7 @@ import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
  * @Author wangc
  * @date 2020.03.30 14:02
  */
+
 public interface UserAccessService {
 
     /**

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.service.UserAccessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @Description
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @Author wangc
  * @date 2020.03.30 14:05
  */
+@Service
 public class UserAccessServiceImpl implements UserAccessService {
 
     @Autowired
@@ -30,7 +32,6 @@ public class UserAccessServiceImpl implements UserAccessService {
     public Result<UserInfoOnEnterGridResultDTO> enterGrid(TokenDto tokenDto, UserEnterGridFormDTO formDTO) {
 
 
-        //TODO  加入不放行白名单
         EnterGridFormDTO userInfoParams = new EnterGridFormDTO();
         userInfoParams.setUserId(tokenDto.getUserId());
         userInfoParams.setCustomerId(formDTO.getCustomerId());
@@ -48,6 +49,7 @@ public class UserAccessServiceImpl implements UserAccessService {
                 log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
             }
         }else{
+            //getUserInfoAndRoles调用失败
 
         }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -18,6 +18,6 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
     @Override
     public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getcustomergridbygridid", formDTO);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -138,6 +138,8 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
 
         Result<UserInfoOnEnterGridResultDTO> result = new Result<>();
         UserInfoOnEnterGridResultDTO resultObj = new UserInfoOnEnterGridResultDTO();
+        resultObj.setCurrentCustomerId(enterGridFormDTO.getCustomerId());
+        resultObj.setCurrentGridId(enterGridFormDTO.getGridId());
         final String customerId = enterGridFormDTO.getCustomerId();
         final String gridId = enterGridFormDTO.getGridId();
 
@@ -205,6 +207,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
 
             UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
             userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId());
+            userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
             UserResiInfoDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
             resultObj.setNickname(userResiInfo.getSurname() + userResiInfo.getName());