From 51508c8c63bb072739a0e3ae45cb11e7599c8f66 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 20 八月 2021 10:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
index 5d274c5..5c12b5e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
@@ -40,31 +40,18 @@
private Long communityId;
+ private Long userId;
+
private static int headSize = 0;
private Map<Integer, String> headData;
- private String userName;
- // FTP 登录密码
- private String password;
- // FTP 服务器地址IP地址
- private String host;
- // FTP 端口
- private int port;
- private String excelUrl;
-
private StringRedisTemplate stringRedisTemplate;
- public static String loadUrl;
-
- public ComMngPopulationLowSecurityExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl, StringRedisTemplate stringRedisTemplate) {
+ public ComMngPopulationLowSecurityExcelListen(CommunityService communityService, Long communityId, Long userId, StringRedisTemplate stringRedisTemplate) {
this.communityService = communityService;
this.communityId = communityId;
- this.userName = userName;
- this.password = password;
- this.host = host;
- this.port = port;
- this.excelUrl = excelUrl;
+ this.userId = userId;
this.stringRedisTemplate = stringRedisTemplate;
}
@@ -426,7 +413,7 @@
//根据list中的IdCard城市来去重
List<ComMngPopulationLowSecurityExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationLowSecurityExcelVO::getDistinctPass)).collect(Collectors.toList());
log.info("开始进入业务层处理逻辑");
- R r = communityService.listSavePopulationLowSecurityExcelVO(newVoList, communityId);
+ R r = communityService.listSavePopulationLowSecurityExcelVO(newVoList, communityId, userId);
log.info("业务层处理逻辑完成");
if (!R.isOk(r)) {
log.info("业务层处理成功");
--
Gitblit v1.7.1