From f0f925ca104354dccbe8645275ec2c5afa1d7817 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 19 五月 2022 14:55:25 +0800
Subject: [PATCH] 花城E+bug更新
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java
index 905fa1c..b5a1a61 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java
@@ -11,7 +11,9 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
+import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.Snowflake;
import lombok.extern.slf4j.Slf4j;
@@ -26,10 +28,12 @@
private static final int BATCH_COUNT = 100;
private CommunityService communityService;
private LoginUserInfoVO loginUserInfo;
+ private UserService userService;
private List<ComMngVillageServeExcelVO> list = new ArrayList<>();
- public ComMngVillageServeExcelListen(CommunityService communityService, LoginUserInfoVO loginUserInfo) {
+ public ComMngVillageServeExcelListen(CommunityService communityService, LoginUserInfoVO loginUserInfo, UserService userService) {
this.communityService = communityService;
this.loginUserInfo = loginUserInfo;
+ this.userService=userService;
}
@Override
@@ -40,7 +44,11 @@
catch (Exception e){
throw new ServiceException("门牌号只能为纯数字");
}
- comMngVillageServeExcelVO.setAddress("四川省-攀枝花市-"+loginUserInfo.getAreaName()+comMngVillageServeExcelVO.getAlley()+"+"+comMngVillageServeExcelVO.getHouseNum());
+ R r1=userService.detailUser(loginUserInfo.getUserId());
+ if(R.isOk(r1)){
+ LoginUserInfoVO loginUserInfoVO=JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
+ comMngVillageServeExcelVO.setAddress("四川省-攀枝花市-"+loginUserInfoVO.getAreaName()+comMngVillageServeExcelVO.getAlley()+"+"+comMngVillageServeExcelVO.getHouseNum());
+ }
list.add(comMngVillageServeExcelVO);
// 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
if (list.size() >= BATCH_COUNT) {
--
Gitblit v1.7.1