From 1e604312e2f50837f1744d2ffcdb1e918e6bb928 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 24 Jun 2022 13:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=8C=B9=E9=85=8D=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PlotBuildingController.java          |  4 ++--
 .../service/EpidemicPlotBuildingService.java        |  2 +-
 .../impl/EpidemicPlotBuildingServiceImpl.java       | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java
index 579e487..4347cd7 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java
@@ -134,8 +134,8 @@ public class PlotBuildingController {
      * @params [file]
      */
     @PostMapping("importBuilding")
-    public Result importBuilding(@RequestParam("file") MultipartFile file) {
-        return epidemicPlotBuildingService.importBuilding(file);
+    public Result importBuilding(@RequestParam("file") MultipartFile file, String gridId) {
+        return epidemicPlotBuildingService.importBuilding(file,gridId);
     }
 
     @PostMapping("updateMaCode")
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java
index 2c7e8cb..168aaff 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java
@@ -72,7 +72,7 @@ public interface EpidemicPlotBuildingService extends CrudService<EpidemicPlotBui
      * @date 2022/4/25 17:03
      * @params [file]
      */
-    Result importBuilding(MultipartFile file);
+    Result importBuilding(MultipartFile file, String gridId);
 
     /**
      * 列出所有楼栋信息
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
index e5fd88b..24e0f61 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
@@ -225,9 +225,9 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
     }
 
     @Override
-    public Result importBuilding(MultipartFile file) {
+    public Result importBuilding(MultipartFile file, String gridId) {
         // 文件基本信息检查
-        AllDeptDTO allDeptInfo = checkInfo(file);
+        AllDeptDTO allDeptInfo = checkInfo(file, gridId);
 
         //读取文件内容，处理数据
         File f = StreamUtils.conversionFile(file);
@@ -520,7 +520,7 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
      * @date 2022/4/25 18:14
      * @params [file]
      */
-    private AllDeptDTO checkInfo(MultipartFile file) {
+    private AllDeptDTO checkInfo(MultipartFile file, String gridId) {
         // 防止多次重复导入导致内存无意义消耗
         String originalFilename = file.getOriginalFilename();
         if (StringUtils.isBlank(originalFilename)) {
@@ -540,7 +540,12 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
         String[] fileNameArr = fileName.split(StrConstant.HYPHEN);
         String gridName = fileNameArr[0];
         //19位370124
-        AllDeptDTO allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridName).getData();
+        AllDeptDTO allDeptInfo;
+        if (StringUtils.isBlank(gridId)) {
+            allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridName).getData();
+        } else {
+            allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridId).getData();
+        }
         if (null == allDeptInfo) {
             throw new RenException("网格信息不存在");
         }