selectRestGridWithoutGivenAreaCode(@Param("areaCode")String areaCode , @Param("cityCode")String cityCode);
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
index 51f1d2cd38..dc2e3e93cc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
@@ -1,7 +1,20 @@
package com.epmet.exception;
+import com.epmet.commons.tools.exception.ErrorCode;
+
/**
- * Created by 11 on 2020/3/19.
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ *
+ * 如：100001001（100001代表模块，001代表业务代码）
+ *
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
*/
-public interface ModuleErrorCode {
+public interface ModuleErrorCode extends ErrorCode {
+
+ int ARGS_NOT_ALLOW_NULL_ERROR = 100019001;
+
+ int NOT_STANDARD_AREA_CODE_ERROR = 100019002;
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index cdc050da2c..fb07d7d585 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -19,7 +19,9 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.entity.CustomerGridEntity;
import java.util.List;
@@ -92,4 +94,11 @@ public interface CustomerGridService extends BaseService {
* @date 2020-03-16
*/
void delete(String[] ids);
+
+ /**
+ * 陌生人查询附近网格数据
+ * 不管传递的areaCode是市级还是县级，都查询整个城市的网格信息，需要特定的排序
+ *
+ * */
+ Result> ListGridForStrangerByOrder(String areaCode, Integer PageNo, Integer pageSize);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 2058bf4d79..9dc2a5f126 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -20,14 +20,19 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.CustomerGridDao;
import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.entity.CustomerGridEntity;
+import com.epmet.exception.ModuleErrorCode;
import com.epmet.redis.CustomerGridRedis;
import com.epmet.service.CustomerGridService;
+import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -101,4 +106,52 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> ListGridForStrangerByOrder(String areaCode, Integer pageNo, Integer pageSize) {
+
+ //判断areaCode是市级还是县级
+ if(StringUtils.isBlank(areaCode)){
+ throw new RenException(ModuleErrorCode.ARGS_NOT_ALLOW_NULL_ERROR,"地区码不能为空！");
+ }
+ if(areaCode.length() != 6){
+ throw new RenException(ModuleErrorCode.NOT_STANDARD_AREA_CODE_ERROR,"无法识别的地区码！");
+ }
+ if(null == pageNo){
+ throw new RenException(ModuleErrorCode.ARGS_NOT_ALLOW_NULL_ERROR,"页码不能为空！");
+ }
+ if(null == pageSize || pageSize <= 0 || pageSize >=100){
+ pageSize = 20;
+ }
+
+ Result> result = new Result<>();
+
+ if(areaCode.endsWith("00")){
+ //城市 - 查全部
+ PageHelper.startPage(pageNo,pageSize);
+ List gridList
+ = baseDao.selectGridByCityLike(areaCode.substring(0,areaCode.length()-2));
+
+ result.setData(gridList);
+ result.setCode(0);
+ return result;
+ }else{
+ //行政区
+ List gridListArea
+ = baseDao.selectGridByAreaCode(areaCode);
+ List restGridListArea
+ = baseDao.selectRestGridWithoutGivenAreaCode(areaCode,areaCode.substring(0,areaCode.length()-2));
+ for(CustomerGridForStangerResultDTO obj : restGridListArea){
+ gridListArea.add(obj);
+ }
+
+ //分页操作
+
+ result.setData(gridListArea);
+ result.setCode(0);
+ return result;
+
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5765fffd44..cd1a2338f0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -22,5 +22,37 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
index 9edd12b94f..b51dd9e7bc 100644
--- a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
+++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
@@ -4,6 +4,8 @@ package com.epmet.dto;/**
import lombok.Data;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
@@ -17,21 +19,46 @@ public class CustomerGridListQueryDTO implements Serializable {
private static final long serialVersionUID = 1L;
- //token信息
- private String token;
-
- //期望分页页码
+ /**
+ * 当前页
+ * */
+ @Min(value = 1)
private Integer pageNo;
- //每页数据量(默认20)
- private Integer pageSize;
-
+ /**
+ * 每页数量
+ * */
+ private Integer pageSize = 20;
+ /**
+ * 地区码
+ * */
private String areaCode;
+ /**
+ * 选定地区编码
+ * */
+ private String selectedAreaCode;
- private String lelectedAreaCode;
-
- //是否首次位置授权(0:是 1:否)
+ /**
+ * 是否首次位置授权(0:是 1:否)
+ */
private Integer isAuthorized;
+
+ /**
+ * 前端传递的省份
+ * */
+ @NotBlank(message = "省份信息不能为空")
+ private String province;
+
+ /**
+ * 前端传递的城市
+ * */
+ @NotBlank(message = "城市信息不能为空")
+ private String city;
+
+ /**
+ * 前端传递的地区
+ * */
+ private String area;
}
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index d51420a810..721594d7d6 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -58,6 +58,11 @@
feign-httpclient
10.3.0
+
+ com.epmet
+ gov-org-client
+ 2.0.0
+
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java
deleted file mode 100644
index a7ef911c89..0000000000
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.epmet.controller;/**
- * Created by 11 on 2020/3/17.
- */
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerGridListQueryDTO;
-import com.epmet.dto.result.CustomerGridListResultDTO;
-import com.epmet.service.ResiGuideService;
-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;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description
- * @ClassName ResiGuideController
- * @Author wangc
- * @date 2020.03.17 11:33
- */
-@RestController
-@RequestMapping("stranger")
-public class ResiGuideController {
-
- @Autowired
- private ResiGuideService resiGuideService;
-
-
- @PostMapping("getlocationcustomergridlist")
- Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){
- Result> result = new Result<>();
-
- //TODO..捕获异常
-
- return result.ok(resiGuideService.ListCustomerGrid(queryParam));
-
- }
-
- @PostMapping("getlelectcdcustomergridlist")
- Result> getlelectcdcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){
- Result> result = new Result<>();
-
- //TODO..捕获异常
-
- return result.ok(resiGuideService.ListCustomerGrid(queryParam));
- }
-}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
new file mode 100644
index 0000000000..aef1f145ba
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
@@ -0,0 +1,53 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
+import com.epmet.service.StrangerAccessRecordService;
+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;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName StrangerAccessRecordController
+ * @Author wangc
+ * @date 2020.03.17 11:33
+ */
+@RestController
+@RequestMapping("stranger")
+public class StrangerAccessRecordController {
+
+ @Autowired
+ private StrangerAccessRecordService strangerAccessRecordService;
+
+
+ /**
+ * 陌生访客授权位置获取附近网格数据
+ *
+ * */
+ @PostMapping("getlocationcustomergridlist")
+ Result> getLocationCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){
+
+ ValidatorUtils.validateEntity(customerGridListQueryDTO);
+
+ return new Result>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
+
+ }
+ /**
+ * 陌生访客自动选定位置获取附近网格数据
+ *
+ * */
+ @PostMapping("getselectcdcustomergridlist")
+ Result> getSelectcdCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){
+
+ ValidatorUtils.validateEntity(customerGridListQueryDTO);
+
+ return new Result>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
+ }
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
index 76965ff098..f707fd0b25 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
@@ -46,7 +46,7 @@ public class StrangerAccessRecordEntity extends BaseEpmetEntity {
/**
* 选择地区编码 (用户选择地区位置
*/
- private String lelectedAreaCode;
+ private String selectedAreaCode;
/**
* 是否首次位置授权(0:是 1:否)
@@ -63,4 +63,10 @@ public class StrangerAccessRecordEntity extends BaseEpmetEntity {
*/
private Date visitTime;
+ private String province;
+
+ private String city;
+
+ private String area;
+
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 990e8fb5db..fe9f1d879b 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -4,19 +4,38 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.dto.result.CustomerGridListResultDTO;
import com.epmet.feign.impl.GovOrgFeginFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
+ * Feign调用gov-org-server模块
* Created by 11 on 2020/3/17.
*/
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class, url="http://localhost:8092")
public interface GovOrgFeignClient {
- @PostMapping(value = "/gov/org/customergrid/{areaCode}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
- Result> getPageForStrangerGuideInterface(@PathVariable("areaCode")String areaCode);
+
+ /**
+ * 根据地区编码获取附近网格数据
+ * @Param areaCode 地区编码
+ * @Param pageNo 当前页
+ * @Param pageSize 每页数据量
+ * */
+ @GetMapping("/gov/org/customergrid/queryListForStrangerByOrder")
+ Result> getPageForStrangerGuideInterface(@RequestParam("areaCode")String areaCode, @RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize);
+
+
+
+
+
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java
index 286ce4e36c..2018edd626 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java
@@ -3,14 +3,14 @@ package com.epmet.feign.impl;/**
*/
import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerGridListQueryDTO;
-import com.epmet.dto.result.CustomerGridListResultDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.feign.GovOrgFeignClient;
import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
+
+
+import java.util.List;
/**
* @Description
@@ -21,9 +21,14 @@ import org.springframework.stereotype.Controller;
@Component
public class GovOrgFeginFallBack implements GovOrgFeignClient {
+ /**
+ * 根据地区编码获取附近网格数据
+ * @Param areaCode 地区编码
+ * @Param pageNo 当前页
+ * @Param pageSize 每页数据量
+ * */
@Override
- public Result> getPageForStrangerGuideInterface(String areaCode) {
-
- return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListByAreaCodeOrderBy",areaCode);
+ public Result> getPageForStrangerGuideInterface(String areaCode, Integer pageNo, Integer pageSize) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",areaCode,pageNo,pageSize);
}
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java
deleted file mode 100644
index 84e11a07da..0000000000
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.epmet.service;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.CustomerGridListQueryDTO;
-import com.epmet.dto.result.CustomerGridListResultDTO;
-import com.epmet.entity.StrangerAccessRecordEntity;
-
-/**
- * Created by 11 on 2020/3/17.
- */
-
-public interface ResiGuideService extends BaseService {
-
- PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO);
-
- void save(StrangerAccessRecordEntity strangerAccessRecordEntity);
-}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
new file mode 100644
index 0000000000..956682fc98
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
@@ -0,0 +1,21 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
+import com.epmet.entity.StrangerAccessRecordEntity;
+
+import java.util.List;
+
+/**
+ * Created by 11 on 2020/3/17.
+ */
+
+public interface StrangerAccessRecordService extends BaseService {
+
+ /**
+ *
+ * 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录
+ * */
+ List ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO);
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java
deleted file mode 100644
index f7b1b32f59..0000000000
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.epmet.service.impl;/**
- * Created by 11 on 2020/3/17.
- */
-
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dao.StrangerAccessRecordDao;
-import com.epmet.dto.CustomerGridListQueryDTO;
-import com.epmet.dto.result.CustomerGridListResultDTO;
-import com.epmet.entity.StrangerAccessRecordEntity;
-import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.service.ResiGuideService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * @Description
- * @ClassName ResiGuideServiceImpl
- * @Author wangc
- * @date 2020.03.17 13:01
- */
-@Service
-public class ResiGuideServiceImpl extends BaseServiceImpl implements ResiGuideService {
-
- @Autowired
- private GovOrgFeignClient govOrgFeignClient;
-
- @Override
- public PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) {
-
- PageData queryResult =
- govOrgFeignClient.getPageForStrangerGuideInterface(customerGridListQueryDTO);
- if(null != queryResult.getList() && queryResult.getList().size() > 0){
- for(CustomerGridListResultDTO obj : queryResult.getList()){
- StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
- //未授权，手动选择 locationAreaCode
- if(0 == customerGridListQueryDTO.getIsAuthorized()){
- strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getLelectedAreaCode());
- }else if( 1 == customerGridListQueryDTO.getIsAuthorized()){
- //已授权，自动选择 lelectedAreaCode
- strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode());
- }
- strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized());
- strangerTrance.setGridNumber(queryResult.getTotal());
- strangerTrance.setVisitTime(new Date());
- strangerTrance.setDelFlag("1");
- strangerTrance.setRevision(0);
- strangerTrance.setCreatedBy("陌生人访客");
- strangerTrance.setCreatedTime(new Date());
-
- insert(strangerTrance);
- }
-
- }
-
- return queryResult;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(StrangerAccessRecordEntity strangerAccessRecordEntity) {
- StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(strangerAccessRecordEntity, StrangerAccessRecordEntity.class);
- insert(entity);
- }
-}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
new file mode 100644
index 0000000000..00d779cfad
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -0,0 +1,80 @@
+package com.epmet.service.impl;/**
+ * Created by 11 on 2020/3/17.
+ */
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.StrangerAccessRecordDao;
+import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.result.CustomerGridForStangerResultDTO;
+import com.epmet.entity.StrangerAccessRecordEntity;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.service.StrangerAccessRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName ResiGuideServiceImpl
+ * @Author wangc
+ * @date 2020.03.17 13:01
+ */
+@Service
+public class StrangerAccessRecordServiceImpl extends BaseServiceImpl implements StrangerAccessRecordService {
+
+ @Autowired
+ private GovOrgFeignClient govOrgFeignClient;
+
+ /**
+ *
+ * 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录
+ * */
+ @Override
+ public List ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) {
+
+ Result> queryResult =
+ govOrgFeignClient
+ .getPageForStrangerGuideInterface(customerGridListQueryDTO.getAreaCode(),customerGridListQueryDTO.getPageNo(),customerGridListQueryDTO.getPageSize());
+ if(0 == queryResult.getCode()) {
+
+
+ List queryList = queryResult.getData();
+ if (null != queryResult && queryList.size() > 0) {
+ StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
+ //未授权，手动选择 locationAreaCode
+ if (0 == customerGridListQueryDTO.getIsAuthorized()) {
+ strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getSelectedAreaCode());
+ } else if (1 == customerGridListQueryDTO.getIsAuthorized()) {
+ //已授权，自动选择 selectedAreaCode
+ strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode());
+ }
+ strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized());
+ strangerTrance.setGridNumber(queryList.size());
+ strangerTrance.setVisitTime(new Date());
+ strangerTrance.setDelFlag("1");
+ strangerTrance.setRevision(0);
+ strangerTrance.setCreatedBy("陌生人访客");
+ strangerTrance.setCreatedTime(new Date());
+ strangerTrance.setProvince(customerGridListQueryDTO.getProvince());
+ strangerTrance.setCity(customerGridListQueryDTO.getCity());
+ strangerTrance.setArea(customerGridListQueryDTO.getArea());
+ insert(strangerTrance);
+
+ return queryList;
+ } else {
+
+ return null;
+ }
+ }else{
+ return null;
+ }
+
+
+ }
+
+
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
index ca90b06034..84434a743a 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
@@ -6,7 +6,7 @@
-
+
@@ -16,6 +16,9 @@
+
+
+