Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-admin/epmet-admin-server/pom.xml

@@ -215,7 +215,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-auth/pom.xml

@@ -301,7 +301,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-gateway/pom.xml

@@ -391,7 +391,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -494,7 +494,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
 

epmet-module/data-report/data-report-server/pom.xml

@@ -291,7 +291,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
 

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -550,7 +550,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -139,7 +139,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		//根据入参，获取项目
 		long start = System.currentTimeMillis();
 		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
-		log.error("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start);
+		log.info("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start);
 		//项目列表为空，返回空数组
 		if(CollectionUtils.isEmpty(projectList)) {
 			return Collections.emptyList();
@@ -197,7 +197,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				return dto;
 			}).collect(Collectors.toList());
 		}
-		log.error("事件上报-组装数据耗时:{}ms",System.currentTimeMillis()-start);
+		log.info("事件上报-组装数据耗时:{}ms",System.currentTimeMillis()-start);
 		return list.stream().collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(EventInfoResultDTO::getId))), ArrayList::new));
 	}
 

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -253,7 +253,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -224,7 +224,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -172,7 +172,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -304,7 +304,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -268,7 +268,7 @@
                 <datasource.druid.password>elink@833066</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -222,7 +222,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -279,7 +279,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -229,7 +229,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -245,7 +245,7 @@
                 <datasource.druid.password>elink@833066</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -317,7 +317,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-access/gov-access-server/pom.xml

@@ -209,7 +209,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -191,7 +191,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -259,7 +259,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -209,7 +209,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-org/gov-org-server/pom.xml

@@ -303,7 +303,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-project/gov-project-server/pom.xml

@@ -286,7 +286,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -218,7 +218,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -230,7 +230,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-access/oper-access-server/pom.xml

@@ -204,7 +204,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -249,7 +249,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -231,7 +231,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-group/resi-group-server/pom.xml

@@ -292,7 +292,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -225,7 +225,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -177,7 +177,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-home/resi-home-server/pom.xml

@@ -199,7 +199,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -216,7 +216,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -254,7 +254,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-voice/resi-voice-server/pom.xml

@@ -175,7 +175,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-openapi/epmet-openapi-scan/pom.xml

@@ -176,7 +176,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-user/epmet-user-server/pom.xml

@@ -299,7 +299,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.10.150</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -24,6 +26,7 @@ public class IcNatRelationEntity extends BaseEpmetEntity {
     /**
      * 客户Id
      */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.entity.IcNatEntity;
 import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.service.impl.IcNatServiceImpl;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -18,6 +19,7 @@ import java.util.List;
 /**
  * 核酸检测excel导入监听器
  */
+@Data
 @Slf4j
 public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelData> {
 
@@ -110,7 +112,7 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
     private void execPersist() {
         try {
             if (datas != null && datas.size() > 0) {
-                icNatService.batchPersist(datas);
+                icNatService.batchPersist(datas, this);
             }
         } finally {
             datas.clear();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcNatDao;
 import com.epmet.dao.IcNatRelationDao;
+import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcNoticeDTO;
@@ -29,6 +30,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcNatEntity;
 import com.epmet.entity.IcNatRelationEntity;
+import com.epmet.entity.IcResiUserEntity;
 import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.handler.IcNatExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -54,10 +56,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -82,6 +81,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     private UserBaseInfoDao userBaseInfoDao;
     @Autowired
     private IcNatRelationDao icNatRelationDao;
+    @Autowired
+    private IcResiUserDao icResiUserDao;
 
     /**
      * @Author sun
@@ -313,7 +314,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             LoginUserDetailsResultDTO loginUserDetails = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(ludf), ServiceConstant.EPMET_USER_SERVER,
                     EpmetErrorCode.SERVER_ERROR.getCode(), "调用user出错", "");
 
-            IcNatExcelImportListener listener = new IcNatExcelImportListener(userId, loginUserDetails.getAgencyId(), loginUserDetails.getOrgIdPath(), this);
+            String agencyId = loginUserDetails.getAgencyId();
+
+            IcNatExcelImportListener listener = new IcNatExcelImportListener(userId, agencyId, loginUserDetails.getOrgIdPath().replace(":".concat(agencyId), ""), this);
 
             EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
@@ -425,14 +428,171 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      * 批量持久化
      * @param entities
      */
-    public void batchPersist(List<IcNatEntity> entities) {
-        //insertBatch(entities);
+    public void batchPersist(List<IcNatEntity> entities, IcNatExcelImportListener listener) {
+        String customerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID);
         String currentUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
+
         entities.forEach(e -> {
-            String id = IdWorker.getIdStr(e);
-            e.setId(id);
-            e.setUpdatedBy(currentUserId);
-            baseDao.insertOrUpdate(e);
+            try {
+                persisNat(e, customerId, currentUserId, listener);
+            } catch (Exception exception) {
+                String errorMsg = ExceptionUtils.getErrorStackTrace(exception);
+                log.error(errorMsg);
+
+                IcNatImportExcelData.ErrorRow errorRow = new IcNatImportExcelData.ErrorRow();
+                errorRow.setName(e.getName());
+                errorRow.setMobile(e.getMobile());
+                errorRow.setIdCard(e.getIdCard());
+                errorRow.setErrorInfo("未知系统错误c ");
+                listener.getErrorRows().add(errorRow);
+            }
         });
     }
+
+    /**
+     * 单条持久化
+     * @param e
+     * @param customerId
+     * @param currentUserId
+     * @param listener
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void persisNat(IcNatEntity e, String customerId, String currentUserId, IcNatExcelImportListener listener) {
+        List<IcNatImportExcelData.ErrorRow> errorRows = listener.getErrorRows();
+
+        Date natTime = e.getNatTime();
+        String idCard = e.getIdCard();
+        String name = e.getName();
+        String mobile = e.getMobile();
+        String natResult = e.getNatResult();
+        String natAddress = e.getNatAddress();
+
+        //1.先看客户下有没有这个人
+        IcNatEntity resiNat = getResiNat(customerId, idCard, natTime);
+        if (resiNat != null && !"import".equals(resiNat.getUserType())) {
+            // 有这个人，并且不是导入的
+            String message = "已存在该次核酸检测录入记录，请到系统中修改";
+
+            IcNatImportExcelData.ErrorRow errorRow = new IcNatImportExcelData.ErrorRow();
+            errorRow.setName(name);
+            errorRow.setMobile(mobile);
+            errorRow.setIdCard(idCard);
+            errorRow.setErrorInfo(message);
+            errorRows.add(errorRow);
+            return;
+        }
+
+        if (resiNat != null) {
+            boolean needUpdate = false;
+            // 有这个人，也是导入的，那就要更新le
+            ArrayList<String> changedFieldNames = new ArrayList<>();
+            if (!name.equals(resiNat.getName())) {
+                changedFieldNames.add("姓名");
+                resiNat.setName(name);
+                needUpdate = true;
+            }
+
+            if (!natResult.equals(resiNat.getNatResult())) {
+                changedFieldNames.add("检测结果");
+                resiNat.setNatResult(natResult);
+                needUpdate = true;
+            }
+
+            // 检测地点和手机号先不提示，说需要提示再提示
+            if (!natAddress.equals(resiNat.getNatAddress())) {
+                changedFieldNames.add("检测地点");
+                resiNat.setNatResult(natAddress);
+                needUpdate = true;
+            }
+
+            if (!mobile.equals(resiNat.getMobile())) {
+                changedFieldNames.add("手机号");
+                resiNat.setMobile(mobile);
+                needUpdate = true;
+            }
+
+            if (changedFieldNames.size() > 0) {
+                String fieldsStr = String.join(",", changedFieldNames);
+                String message = "该次核酸检测记录已存在，执行更新动作，" + fieldsStr + "已成功更新";
+                IcNatImportExcelData.ErrorRow errorRow = new IcNatImportExcelData.ErrorRow();
+                errorRow.setName(name);
+                errorRow.setMobile(mobile);
+                errorRow.setIdCard(idCard);
+                errorRow.setErrorInfo(message);
+                errorRows.add(errorRow);
+            }
+
+            if (needUpdate) {
+                resiNat.setUpdatedBy(currentUserId);
+                resiNat.setUpdatedTime(new Date());
+                baseDao.updateById(resiNat);
+            }
+
+            // 还要创建关系
+            createNatRelation(resiNat.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids());
+
+            return;
+        }
+
+        // 执行新增操作
+        e.setIsResiUser(isResi(customerId, idCard));
+        e.setUserType("import");
+
+        baseDao.insert(e);
+
+        // 还要创建关系
+        createNatRelation(e.getId(), listener.getCurrentAgencyId(), listener.getCurrentAgencyPids());
+    }
+
+    /**
+     * 是否是客户下的居民；
+     * 0：否
+     * 1：是
+     * @param customerId
+     * @param idCard
+     * @return
+     */
+    public String isResi(String customerId, String idCard) {
+        LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper();
+        query.eq(IcResiUserEntity::getCustomerId, customerId);
+        query.eq(IcResiUserEntity::getIdCard, idCard);
+        return icResiUserDao.selectCount(query) > 0 ? "1" : "0";
+    }
+
+    /**
+     *
+     * @param customerId
+     * @param idCard
+     * @return
+     */
+    public IcNatEntity getResiNat(String customerId, String idCard, Date natTime) {
+        LambdaQueryWrapper<IcNatEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcNatEntity::getCustomerId, customerId);
+        query.eq(IcNatEntity::getIdCard, idCard);
+        query.eq(IcNatEntity::getNatTime, natTime);
+        return baseDao.selectOne(query);
+    }
+
+    /**
+     * 创建nat关系
+     * @param natId
+     * @param currentUserAgencyId
+     */
+    private void createNatRelation(String natId, String currentUserAgencyId, String agencyPids) {
+
+        // 没有关系创建关系，有关系就跳过
+        LambdaQueryWrapper<IcNatRelationEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcNatRelationEntity::getIcNatId, natId);
+        query.eq(IcNatRelationEntity::getAgencyId, currentUserAgencyId);
+        if (icNatRelationDao.selectCount(query) > 0) {
+            return;
+        }
+
+        IcNatRelationEntity relation = new IcNatRelationEntity();
+        relation.setAgencyId(currentUserAgencyId);
+        relation.setPids(String.join(":", Arrays.asList(agencyPids, currentUserAgencyId)));
+        relation.setIcNatId(natId);
+        relation.setUserType("import");
+        icNatRelationDao.insert(relation);
+    }
 }