- 优化居民导入

- 优化日志切面打印，增加对MultipartFile类型的过滤

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -10,6 +10,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -286,6 +287,7 @@ public abstract class BaseRequestLogAspect {
                 if (object != null
                         && !(object instanceof ServletRequest)
                         && !(object instanceof ServletResponse)
+                        && !(object instanceof MultipartFile)
                 ) {
                     try {
                         // 尝试作为json解析

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

@@ -265,6 +265,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             Map<String, ResiImportChangedData> categoryChangedResis = newlyOrChangedResi.get().getCategoryChangedResis();
             Map<String, ResiImportChangedData> transferedResis = newlyOrChangedResi.get().getTransferedResis();
 
+            log.info("类别变动居民数:{}", categoryChangedResis.size());
+            log.info("调动居民数:{}", transferedResis.size());
+
             //保存调动或者变更记录
             saveNewResiCategoryRecord();
             saveResiCategoryChangedRecord(categoryChangedResis);
@@ -469,7 +472,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                             resiCategories);
 
                     redisUtils.hMSet(RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", resiId), BeanUtil.beanToMap(categoryData));
-
+                    categoryData = null;
                 }
 
             } catch (Exception e) {
@@ -1182,6 +1185,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             ResiImportCategoryData newResiCateData = ConvertUtils.mapToEntity(addUserMap, ResiImportCategoryData.class);
             newResiCateData.getCategories().put(columnName, "1");
             redisUtils.hMSet(userCateRedisKey, BeanUtil.beanToMap(newResiCateData));
+            newResiCateData = null;
             return;
         }
 
@@ -1360,7 +1364,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                         newResiInfoObj.getHomeId(), "add", "新增", column.getKey(), 1, resiInfo.getPids());
 
                 icUserChangeDetailedDao.insert(changedetail);
+                changedetail = null;
             }
+
+            changeRecord = null;
+            newResiInfoObj = null;
         }
     }
 

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -79,6 +79,11 @@ spring:
         namespace: @nacos.config.namespace@
         group: @nacos.config.group@
         file-extension: yaml
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+
 management:
   endpoints:
     web: