Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/VisitVisitorDTO.java

@@ -122,8 +122,22 @@ public class VisitVisitorDTO implements Serializable {
 	private String room;
 
     /**
-     * 二维码地区code
+     * 组织id
      */
-    private String areaCode;
+    private String agencyId;
 
+    /**
+     * 上级组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 组织的所有上级组织id
+     */
+    private String agencyPids;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitVisitorFormDTO.java

@@ -60,6 +60,11 @@ public class VisitVisitorFormDTO implements Serializable {
      */
 	private String faceImg;
 
+    /**
+     * 小区ID
+     */
+    private String neighborhoodId;
+
     /**
      * 小区
      */
@@ -80,11 +85,6 @@ public class VisitVisitorFormDTO implements Serializable {
      */
 	private String room;
 
-    /**
-     * 二维码地区code
-     */
-    private String areaCode;
-
     /**
      * 客户ID
      */

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/entity/VisitVisitorEntity.java

@@ -92,8 +92,23 @@ public class VisitVisitorEntity extends BaseEpmetEntity {
 	private String room;
 
 	/**
-	 * 二维码地区code
+	 * 组织id
 	 */
-	private String areaCode;
+	private String agencyId;
+
+	/**
+	 * 上级组织id
+	 */
+	private String parentAgencyId;
+
+	/**
+	 * 组织的所有上级组织id
+	 */
+	private String agencyPids;
+
+	/**
+	 * 网格id
+	 */
+	private String gridId;
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java

@@ -3,9 +3,13 @@ package com.epmet.plugin.power.modules.visit.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.EpmetErrorCode;
 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.dto.IcNeighborHoodDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
 import com.epmet.plugin.power.modules.visit.dao.VisitVisitorDao;
@@ -33,6 +37,9 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
     @Autowired
     private VisitVisitorRedis visitVisitorRedis;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Override
     public PageData<VisitVisitorDTO> page(Map<String, Object> params) {
         IPage<VisitVisitorEntity> page = baseDao.selectPage(
@@ -89,6 +96,13 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
     @Transactional(rollbackFor = Exception.class)
     public void visit(VisitVisitorFormDTO dto) {
         VisitVisitorEntity entity = ConvertUtils.sourceToTarget(dto, VisitVisitorEntity.class);
+        Result<IcNeighborHoodDTO> result = govOrgOpenFeignClient.getIcNeighbordhoodById(dto.getNeighborhoodId());
+        if (result.success()) {
+            entity.setGridId(result.getData().getGridId());
+            entity.setAgencyId(result.getData().getAgencyId());
+            entity.setParentAgencyId(result.getData().getParentAgencyId());
+            entity.setAgencyPids(result.getData().getAgencyPids());
+        }
         insert(entity);
     }