From 12e94ba6d6cb64e2e631447194d385a054fb8860 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 21 Jun 2022 16:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20pc=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constants/ImportTaskConstants.java  |   1 +
 .../dto/result/CommunityInfoResultDTO.java    |  41 +++
 .../controller/CustomerAgencyController.java  |  12 +
 .../java/com/epmet/dao/CustomerAgencyDao.java |   2 +
 .../epmet/service/CustomerAgencyService.java  |  10 +
 .../impl/CustomerAgencyServiceImpl.java       |   7 +
 .../resources/mapper/CustomerAgencyDao.xml    |  13 +
 .../IcPointNucleicMonitoringController.java   |  71 +++++
 .../dao/IcPointNucleicMonitoringDao.java      |  12 +-
 .../IcPointNucleicMonitoringImportExcel.java  |  58 +++++
 .../PointNucleicMonitoringErrorModel.java     |  35 +++
 .../com/epmet/feign/GovOrgFeignClient.java    |  11 +
 .../fallback/GovOrgFeignClientFallBack.java   |   6 +
 .../IcPointNucleicMonitoringService.java      |  13 +-
 .../IcPointNucleicMonitoringServiceImpl.java  | 244 +++++++++++++++++-
 .../excel/ic_point_nucleic_monitoring.xlsx    | Bin 0 -> 11348 bytes
 .../mapper/IcPointNucleicMonitoringDao.xml    |   9 +-
 17 files changed, 537 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
index 8c439aa218..9c461a1f18 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
@@ -19,6 +19,7 @@ public interface ImportTaskConstants {
     String BIZ_TYPE_ATTENTION_VACCINATION = "attention_vaccination";
     String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination";
     String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member";
+    String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring";
     /**
      * 核酸检测
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
new file mode 100644
index 0000000000..46300096d5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityInfoResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 社区所属组织基本信息
+ * @Author wgf
+ * @Date 2020/4/26 22:35
+ */
+@Data
+public class CommunityInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 4360690752084258055L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 社区组织ID
+     */
+    private String deptId;
+
+    /**
+     * 社区名称
+     */
+    private String deptName;
+
+    /**
+     * 网格的上级组织
+     */
+    private String pid;
+
+    /**
+     * 网格的所有上级组织
+     */
+    private String pids;
+}
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 5325163074..24008e536e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -463,5 +463,17 @@ public class CustomerAgencyController {
         return new Result<DelAgencyGridIdResultDTO>().ok(customerAgencyService.getDelAgencyGridIdList(agencyId));
     }
 
+    /**
+     * @param orgName
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    @GetMapping("getCommunityInfo/{orgName}")
+    public Result<CommunityInfoResultDTO> getCommunityInfo(@PathVariable("orgName") String orgName) {
+        return customerAgencyService.getCommunityInfo(orgName);
+    }
+
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 02e483d9f2..17fb8356f3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -344,5 +344,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
                                                         @Param("customerId") String customerId);
 
     List<String> getDelAgencyIdList(@Param("agencyId") String agencyId);
+
+    CommunityInfoResultDTO getCommunityInfo(@Param("orgName") String orgName);
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index dcdc1d44a8..d6651bc29b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -24,6 +24,7 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.Map;
@@ -317,4 +318,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 获取当前组织及下级无效组织、网格Id列表
      **/
     DelAgencyGridIdResultDTO getDelAgencyGridIdList(String agencyId);
+
+    /**
+     * @param orgName
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2022/6/21 22:41
+     **/
+    Result<CommunityInfoResultDTO> getCommunityInfo(String orgName);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index adaf547abf..7c6cfa6d50 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1566,4 +1566,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfo(String orgName) {
+        CommunityInfoResultDTO communityInfoResultDTO = baseDao.getCommunityInfo(orgName);
+
+        return new Result<CommunityInfoResultDTO>().ok(communityInfoResultDTO);
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 2fd5aa5feb..e5d635d88f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -880,4 +880,17 @@
         AND pids LIKE CONCAT('%', #{agencyId}, '%')
     </select>
 
+    <select id="getCommunityInfo" resultType="com.epmet.dto.result.CommunityInfoResultDTO">
+        select
+        ID as deptId,
+        CUSTOMER_ID,
+        PID,
+        PIDS,
+        ORGANIZATION_NAME as deptName
+        from customer_agency
+        where DEL_FLAG = '0'
+        and ORGANIZATION_NAME = #{orgName}
+        limit 1
+    </select>
+
 </mapper>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
index 4b97c98389..b1bc4385a3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointNucleicMonitoringController.java
@@ -1,7 +1,13 @@
 package com.epmet.controller;
 
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -9,13 +15,22 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcPointNucleicMonitoringExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcPointNucleicMonitoringService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,11 +43,15 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("icPointNucleicMonitoring")
+@Slf4j
 public class IcPointNucleicMonitoringController {
 
     @Autowired
     private IcPointNucleicMonitoringService icPointNucleicMonitoringService;
 
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
     @RequestMapping("page")
     public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params){
         PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.page(params);
@@ -78,5 +97,57 @@ public class IcPointNucleicMonitoringController {
     }
 
 
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param
+     * @author wgf
+     * @date 2022/6/21 13:40
+     */
+    @PostMapping("pointNucleicMonitoringImport")
+    public Result pointNucleicMonitoringImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){
+        if (file.isEmpty()) {
+            throw new EpmetException("请上传文件");
+        }
+        // 校验文件类型
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (!"xls".equals(extension) && !"xlsx".equals(extension)) {
+            throw new EpmetException("文件类型不匹配");
+        }
+
+        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
+        importTaskForm.setOriginFileName(file.getOriginalFilename());
+        importTaskForm.setOperatorId(tokenDto.getUserId());
+        importTaskForm.setBizType(ImportTaskConstants.IC_POINT_NUCLEIC_MONITORING);
+        Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm);
+        if (!result.success()) {
+            throw new EpmetException(9999,"存在进行中的导入");
+        }
+        InputStream inputStream = null;
+        try {
+            inputStream = file.getInputStream();
+        }catch (Exception e){
+            ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+            input.setOperatorId(tokenDto.getUserId());
+            input.setTaskId(result.getData().getTaskId());
+            input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            commonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
+        }
+        icPointNucleicMonitoringService.importFile(tokenDto,inputStream,result.getData().getTaskId());
+        return new Result();
+    }
+
+    /**
+     * 导出模板
+     * @param response
+     * @throws Exception
+     */
+    @PostMapping("exporttemplate")
+    public void exportTemplate( HttpServletResponse response) throws Exception {
+        TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_nucleic_monitoring.xlsx");
+        ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"核酸检测点录入表",response);
+    }
+
+
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
index 5621b19449..563d33553d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java
@@ -4,6 +4,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 核酸监测点
  *
@@ -12,5 +14,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonitoringEntity> {
-	
-}
\ No newline at end of file
+
+    /**
+     * 获取所有地点名称
+     * @return
+     */
+    List<String> getAllAddressName();
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java
new file mode 100644
index 0000000000..22c04a2b51
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPointNucleicMonitoringImportExcel.java
@@ -0,0 +1,58 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+public class IcPointNucleicMonitoringImportExcel {
+
+    @Excel(name = "所属组织名称")
+    private String orgName;
+
+    @Excel(name = "核酸监测点名称")
+    private String name;
+
+    @Excel(name = "服务时间")
+    private String serveTime;
+
+    @Excel(name = "咨询电话")
+    private String mobile;
+
+    @Excel(name = "监测点地址")
+    private String address;
+
+    @ExcelIgnore
+    private Boolean addStatus = false;
+
+    @ExcelIgnore
+    private Integer num;
+
+    /**
+     * 所属组织ID
+     */
+    @ExcelIgnore
+    private String orgId;
+
+    /**
+     * 组织ID上级
+     */
+    @ExcelIgnore
+    private String pid;
+
+    /**
+     * 组织ID所有上级
+     */
+    @ExcelIgnore
+    private String pids;
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java
new file mode 100644
index 0000000000..722142e35b
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/PointNucleicMonitoringErrorModel.java
@@ -0,0 +1,35 @@
+package com.epmet.excel.error;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/6/21 16:57
+ * @DESC
+ */
+@Data
+public class PointNucleicMonitoringErrorModel {
+
+    @Excel(name = "行号",width = 10)
+    private Integer num;
+
+    @Excel(name = "所属组织名称",width = 30)
+    private String orgName;
+
+    @Excel(name = "核酸监测点名称",width = 30)
+    private String name;
+
+    @Excel(name = "服务时间",width = 20)
+    private String serveTime;
+
+    @Excel(name = "电话",width = 30)
+    private String mobile;
+
+    @Excel(name = "监测点地址",width = 40)
+    private String address;
+
+    @Excel(name = "错误信息", width = 200)
+    private String errorMsg;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index e0f881766e..b364fa689d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -63,4 +64,14 @@ public interface GovOrgFeignClient {
     //@PostMapping("/gov/org/grid/getbaseinfo")
     //Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 
+    /**
+     * @param orgName
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 根据社区名称查询所属组织信息
+     * @Date 2020/4/26 23:16
+     **/
+    @GetMapping("/gov/org/customeragency/getCommunityInfo/{orgName}")
+    Result<CommunityInfoResultDTO> getCommunityInfo(@PathVariable("orgName") String orgName);
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 047208bdc4..f01da41601 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
@@ -39,4 +40,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     //public Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO) {
     //    return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridBaseInfoByGridId", customerGridFormDTO);
     //}
+
+    @Override
+    public Result<CommunityInfoResultDTO> getCommunityInfo(String orgName) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfo",orgName);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java
index 5cde04efe2..d74f89f861 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java
@@ -2,9 +2,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcPointNucleicMonitoringDTO;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -75,4 +77,13 @@ public interface IcPointNucleicMonitoringService extends BaseService<IcPointNucl
      * @date 2022-06-20
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @author zxc
+     * @date 2022/3/29 15:35
+     */
+    void importFile(TokenDto tokenDto, InputStream inputStream, String taskId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
index 90707250fd..9256d6f9fa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java
@@ -1,24 +1,58 @@
 package com.epmet.service.impl;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 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.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcPointNucleicMonitoringDao;
 import com.epmet.dto.IcPointNucleicMonitoringDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.CommunityInfoResultDTO;
+import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
+import com.epmet.excel.IcPointNucleicMonitoringImportExcel;
+import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel;
+import com.epmet.excel.error.PointNucleicMonitoringErrorModel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OssFeignClient;
 import com.epmet.redis.IcPointNucleicMonitoringRedis;
 import com.epmet.service.IcPointNucleicMonitoringService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 核酸监测点
@@ -27,11 +61,21 @@ import java.util.Map;
  * @since v1.0.0 2022-06-20
  */
 @Service
+@Slf4j
 public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPointNucleicMonitoringDao, IcPointNucleicMonitoringEntity> implements IcPointNucleicMonitoringService {
 
     @Autowired
     private IcPointNucleicMonitoringRedis icPointNucleicMonitoringRedis;
 
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
     @Override
     public PageData<IcPointNucleicMonitoringDTO> page(Map<String, Object> params) {
         IPage<IcPointNucleicMonitoringEntity> page = baseDao.selectPage(
@@ -84,4 +128,196 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+    /**
+     * Desc: 【核酸检测点】导入
+     * @param tokenDto
+     * @param inputStream
+     * @param taskId
+     * @author wgf
+     * @date 2022/3/29 15:35
+     */
+    @Override
+    @Async
+    public void importFile(TokenDto tokenDto, InputStream inputStream, String taskId) {
+        List<PointNucleicMonitoringErrorModel> errorInfo = new ArrayList<>();
+
+        try {
+            List<IcPointNucleicMonitoringImportExcel> list = ExcelPoiUtils.importExcel(inputStream, 0,1,IcPointNucleicMonitoringImportExcel.class);
+            if (CollectionUtils.isEmpty(list)){
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+                return;
+            }
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("未查询到工作人员信息"+tokenDto.getUserId());
+            }
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+            if (null == agencyInfo){
+                throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
+            }
+            // 获取所有地点名称
+            List<String> addressList = baseDao.getAllAddressName();
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setNum(i+1);
+                if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "所属组织名称不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getServeTime()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "服务时间不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getMobile()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "咨询电话不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                if (StringUtils.isBlank(list.get(i).getAddress()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "监测点地址不能为空",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+                // 校验数据库是否存在该地点名称
+                if (addressList.contains(list.get(i).getName()) && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "核酸监测点名称已存在",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }
+
+                // 校验所属组织通过名称能否匹配到ID
+                Result<CommunityInfoResultDTO> resultDTOResult = govOrgFeignClient.getCommunityInfo(list.get(i).getOrgName());
+                CommunityInfoResultDTO communityInfoResultDTO = resultDTOResult.getData();
+                if(communityInfoResultDTO == null && !list.get(i).getAddStatus()){
+                    errorInfo.add(getErrorInfo(list.get(i), "所属组织匹配失败",i+1));
+                    list.get(i).setAddStatus(true);
+                    continue;
+                }else{
+                    list.get(i).setOrgId(communityInfoResultDTO.getDeptId());
+                    list.get(i).setPid(communityInfoResultDTO.getPid());
+                    list.get(i).setPids(communityInfoResultDTO.getPids());
+                }
+
+            }
+            if (list.size() > errorInfo.size()){
+                Map<String, Long> groupByName = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getName, Collectors.counting()));
+                groupByName.forEach((name,count) -> {
+                    if (Integer.valueOf(count.toString()).compareTo(1) != 0){
+                        for (IcPointNucleicMonitoringImportExcel i : list) {
+                            if (name.equals(i.getName()) && !i.getAddStatus()){
+                                errorInfo.add(getErrorInfo(i,"数据重复",i.getNum()));
+                                i.setAddStatus(true);
+                            }
+                        }
+                    }
+                });
+            }
+            Map<Boolean, List<IcPointNucleicMonitoringImportExcel>> groupByStatus = list.stream().collect(Collectors.groupingBy(IcPointNucleicMonitoringImportExcel::getAddStatus));
+            List<IcPointNucleicMonitoringImportExcel> needInsert = groupByStatus.get(false);
+            if (CollectionUtils.isNotEmpty(needInsert)){
+                List<IcPointNucleicMonitoringEntity> entities = ConvertUtils.sourceToTarget(needInsert, IcPointNucleicMonitoringEntity.class);
+                entities.forEach(e -> {
+                    // 设置客户ID
+                    e.setCustomerId(tokenDto.getCustomerId());
+                });
+                insertBatch(entities);
+            }
+            if (CollectionUtils.isNotEmpty(errorInfo)){
+                String url = importOssUpload(errorInfo, EpidemicSpecialAttentionErrorModel.class);
+                closeTask(taskId,tokenDto.getUserId(), ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,url);
+            }else {
+                closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,"");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+            closeTask(taskId,tokenDto.getUserId(),ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,"");
+        }
+    }
+
+    /**
+     * Desc: 关闭任务
+     * @param taskId
+     * @param userId
+     * @param status
+     * @param url
+     * @author wgf
+     * @date 2022/3/30 09:05
+     */
+    public void closeTask(String taskId,String userId,String status,String url){
+        ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
+        input.setOperatorId(userId);
+        input.setTaskId(taskId);
+        input.setProcessStatus(status);
+        input.setResultDescFilePath(url);
+        commonServiceOpenFeignClient.finishImportTask(input);
+    }
+
+    /**
+     * Desc: 构造错误信息
+     * @param dto
+     * @param info
+     * @param num
+     * @author wgf
+     * @date 2022/3/29 17:17
+     */
+    public PointNucleicMonitoringErrorModel getErrorInfo(IcPointNucleicMonitoringImportExcel dto, String info, Integer num){
+        PointNucleicMonitoringErrorModel result = ConvertUtils.sourceToTarget(dto, PointNucleicMonitoringErrorModel.class);
+        result.setErrorMsg(info);
+        result.setNum(num);
+        return result;
+    }
+
+    /**
+     * Desc: 文件上传并返回url
+     * @param errorRows
+     * @param tClass
+     * @author zxc
+     * @date 2022/3/30 09:16
+     */
+    public <T> String importOssUpload(Collection<?> errorRows, Class<T> tClass) throws IOException {
+        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的数据列表","导入失败的数据列表"),
+                tClass, errorRows);
+
+        // 文件名
+        String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
+
+        FileItemFactory factory = new DiskFileItemFactory(16, null);
+        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+        OutputStream os = fileItem.getOutputStream();
+        Result<UploadImgResultDTO> uploadResult = null;
+        try {
+            workbook.write(os);
+            uploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
+        } catch (Exception e) {
+            String errormsg = ExceptionUtils.getErrorStackTrace(e);
+            log.error("上传错误描述文件:{}", errormsg);
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件关闭输出流:{}", errormsg);
+            }
+            try {
+                fileItem.delete();
+            } catch (Exception e) {
+                String errormsg = ExceptionUtils.getErrorStackTrace(e);
+                log.error("上传错误描述文件删除临时文件:{}", errormsg);
+            }
+        }
+
+        if (uploadResult == null || !uploadResult.success()) {
+            log.error("调用OSS上传结果描述文件失败");
+            return null;
+        }
+        return uploadResult.getData().getUrl();
+    }
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_point_nucleic_monitoring.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5afef2dc0a41cdd614b64316e8feaf2cc14c88f2
GIT binary patch
literal 11348
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

literal 0
HcmV?d00001

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
index e3c97b3342..2cb4e10db6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml
@@ -24,5 +24,12 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getAllAddressName" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+    </select>
 
-</mapper>
\ No newline at end of file
+
+</mapper>