From a0080d936baa2593c90882d19b2d5cf7ab082326 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 15 Nov 2023 14:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/handler/IcPartyActivityImportListener.java |  2 ++
 .../handler/IcPartyUnitExcelImportListener.java      |  2 ++
 .../impl/IcCommunitySelfOrganizationServiceImpl.java |  2 ++
 .../com/epmet/controller/IcEnterpriseController.java |  2 +-
 .../handler/IcEnterpriseExcelImportListener.java     |  4 ++--
 .../IcSuperiorResourceExcelImportListener.java       | 12 ++++++++----
 .../service/impl/IcSuperiorResourceServiceImpl.java  |  2 +-
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyActivityImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyActivityImportListener.java
index 26e1d9d2a3..32f53f9a6d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyActivityImportListener.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyActivityImportListener.java
@@ -60,6 +60,8 @@ public class IcPartyActivityImportListener implements ReadListener<IcPartyActivi
             e.setAgencyId(staffInfo.getAgencyId());
             e.setPids(staffInfo.getAgencyPIds());
             e.setContent(StrConstant.EPMETY_STR);
+            e.setLatitude(staffInfo.getLatitude());
+            e.setLongitude(staffInfo.getLongitude());
             datas.add(e);
 
             if (datas.size() == MAX_THRESHOLD) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyUnitExcelImportListener.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyUnitExcelImportListener.java
index eb823af8e4..7cc8d98286 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyUnitExcelImportListener.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/handler/IcPartyUnitExcelImportListener.java
@@ -88,6 +88,8 @@ public class IcPartyUnitExcelImportListener implements ReadListener<IcPartyUnitI
             e.setCustomerId(customerId);
             e.setAgencyId(staffInfo.getAgencyId());
             e.setPids(staffInfo.getAgencyPIds());
+            e.setLongitude(staffInfo.getLongitude());
+            e.setLatitude(staffInfo.getLatitude());
             datas.add(e);
 
             if (datas.size() == MAX_THRESHOLD) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index bdfe777e7c..bb9553f53e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -603,6 +603,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
+                    e.setLatitude(agencyInfo.getLatitude());
+                    e.setLongitude(agencyInfo.getLongitude());
                     e.setOrganizationCreatedTime(StringUtils.isNotBlank(l.getOrganizationCreatedTime()) ? DateUtils.stringToDate(l.getOrganizationCreatedTime(), DATE_PATTERN) : new Date());
                     //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
                     String categoryName=l.getCategoryCode();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java
index 2df8e63140..6cf38d21d6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java
@@ -278,7 +278,7 @@ public class IcEnterpriseController implements ResultDataResolver {
     }
 
     /**
-     *
+     * 九小场所导入
      * @param tokenDto
      * @param file
      * @return
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
index 99a76ad94e..823a0c0bc2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
@@ -95,8 +95,8 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setAgencyPids(staffInfo.getAgencyPIds());
             //场所类型
             enterpriseEntity.setPlaceType(placeTypeMap.get(data.getPlaceTypeName()));
-            enterpriseEntity.setLongitude(StrConstant.EPMETY_STR);
-            enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
+            enterpriseEntity.setLongitude(staffInfo.getLongitude());
+            enterpriseEntity.setLatitude(staffInfo.getLatitude());
             //规模
             // enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
             enterpriseEntity.setScaleTotal(Integer.valueOf(data.getScaleTotal()));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
index 6f0e8b63fe..f2c61a7605 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
@@ -3,6 +3,7 @@ package com.epmet.excel.handler;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -37,7 +38,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
     private String currentCustomerId;
     private String currentAgencyId;
     private String currentAgencyPids;
-
+    private CustomerStaffInfoCacheResult staffInfo;
     //数据
     private List<IcSuperiorResourceEntity> datas = new ArrayList<>();
     //错误项列表
@@ -51,8 +52,8 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
     private Map<String, String> existMap = null;
 
 
-    public IcSuperiorResourceExcelImportListener(String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids,
-        IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl, CoverageService coverageService, IcSuperiorResourceDao icSuperiorResourceDao) {
+    public IcSuperiorResourceExcelImportListener(CustomerStaffInfoCacheResult staffInfo, String currentUserId, String currentCustomerId, String currentAgencyId, String currentAgencyPids,
+                                                 IcSuperiorResourceServiceImpl icSuperiorResourceServiceImpl, CoverageService coverageService, IcSuperiorResourceDao icSuperiorResourceDao) {
         this.currentUserId = currentUserId;
         this.currentCustomerId = currentCustomerId;
         this.currentAgencyId = currentAgencyId;
@@ -60,6 +61,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
         this.icSuperiorResourceServiceImpl = icSuperiorResourceServiceImpl;
         this.coverageService = coverageService;
         this.icSuperiorResourceDao = icSuperiorResourceDao;
+        this.staffInfo = staffInfo;
     }
 
     @Override
@@ -96,7 +98,9 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
             icSuperiorResourceEntity.setSourceType("import");
             icSuperiorResourceEntity.setCategory(data.getCategoryName());
             icSuperiorResourceEntity.setAreaCovered(data.getAreaCoveredName());
-            if(StringUtils.isNotBlank(data.getCapacityName())){
+            icSuperiorResourceEntity.setLatitude(staffInfo.getLatitude());
+            icSuperiorResourceEntity.setLongitude(staffInfo.getLongitude());
+            if (StringUtils.isNotBlank(data.getCapacityName())) {
                 icSuperiorResourceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
             }
             icSuperiorResourceEntity.setCreatedBy(currentUserId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
index 25918bbd04..f9c8cc5d9c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
@@ -214,7 +214,7 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
             String agencyId = staffInfo.getAgencyId();
             String agencyIdPath = StringUtils.isNotBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId() : staffInfo.getAgencyId();
 
-            IcSuperiorResourceExcelImportListener listener = new IcSuperiorResourceExcelImportListener(userId, customerId, agencyId, agencyIdPath, this, coverageService, icSuperiorResourceDao);
+            IcSuperiorResourceExcelImportListener listener = new IcSuperiorResourceExcelImportListener(staffInfo,userId, customerId, agencyId, agencyIdPath, this, coverageService, icSuperiorResourceDao);
 
             EasyExcel.read(filePath.toFile(), IcSuperiorResourceExcel.class, listener).headRowNumber(1).sheet(0).doRead();