resi模块，controller分开，分成stranger和strangerAccessRecord两个RequestMapping

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

@@ -23,6 +23,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

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

@@ -27,43 +27,14 @@ import java.util.Map;
  * @date 2020.03.17 11:33
  */
 @RestController
-@RequestMapping("stranger")
+@RequestMapping("strangerAccessRecordController")
 public class StrangerAccessRecordController {
 
     @Autowired
     private StrangerAccessRecordService strangerAccessRecordService;
 
 
-    /**
-     * @Description 陌生访客根据自动定位获取附近网格数据
-     * @Param CustomerGridListFormDTO
-     * @return Result<List<CustomerGridForStrangerResultDTO>>
-     * @Author wangc
-     * @Date 2020.03.19 14:13
-     **/
-    @PostMapping("getlocationcustomergridlist")
-    Result<List<CustomerGridForStrangerResultDTO>> getLocationCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
-
-        ValidatorUtils.validateEntity(customerGridListFormDTO);
-
-        return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
-
-    }
 
-    /**
-     * @Description 陌生访客手动选定位置获取附近网格数据
-     * @Param CustomerGridListFormDTO
-     * @return Result<List<CustomerGridForStrangerResultDTO>>
-     * @Author wangc
-     * @Date 2020.03.19 14:13
-     **/
-    @PostMapping("getselectcdcustomergridlist")
-    Result<List<CustomerGridForStrangerResultDTO>> getSelectcdCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
-
-        ValidatorUtils.validateEntity(customerGridListFormDTO);
-
-        return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
-    }
     /**
      *  查询陌生人访问记录
      * @Author yangshaoping

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

@@ -18,8 +18,12 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CustomerGridListFormDTO;
 import com.epmet.dto.form.StrangerFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.service.StrangerAccessRecordService;
 import com.epmet.service.StrangerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,6 +31,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * 居民端-陌生人导览
@@ -40,6 +46,9 @@ public class StrangerResiGuideController {
 	@Autowired
 	private StrangerService strangerService;
 
+	@Autowired
+	private StrangerAccessRecordService strangerAccessRecordService;
+
 	/**
 	 * @param
 	 * @Author  sun
@@ -51,4 +60,37 @@ public class StrangerResiGuideController {
 		return strangerService.getgridhome(formDTO);
 	}
 
+
+
+	/**
+	 * @Description 陌生访客根据自动定位获取附近网格数据
+	 * @Param CustomerGridListFormDTO
+	 * @return Result<List<CustomerGridForStrangerResultDTO>>
+	 * @Author wangc
+	 * @Date 2020.03.19 14:13
+	 **/
+	@PostMapping("getlocationcustomergridlist")
+	Result<List<CustomerGridForStrangerResultDTO>> getLocationCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
+
+		ValidatorUtils.validateEntity(customerGridListFormDTO);
+
+		return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
+
+	}
+
+	/**
+	 * @Description 陌生访客手动选定位置获取附近网格数据
+	 * @Param CustomerGridListFormDTO
+	 * @return Result<List<CustomerGridForStrangerResultDTO>>
+	 * @Author wangc
+	 * @Date 2020.03.19 14:13
+	 **/
+	@PostMapping("getselectcdcustomergridlist")
+	Result<List<CustomerGridForStrangerResultDTO>> getSelectcdCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
+
+		ValidatorUtils.validateEntity(customerGridListFormDTO);
+
+		return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
+	}
+
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
  * @Author wangc
  * @date 2020.03.17 14:29
  */
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class, url = "http://localhost:8092")
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class)
 public interface GovOrgFeignClient {
 
     /**