From 790b74df7a3e3f5af847e3d5da939f0ebe85cd9c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 10 Mar 2022 09:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=9B=A0=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 6 +++---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 62b7dbf697..c636d91b43 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -415,7 +415,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                        String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
                                        String currUserAgencyPids, String currentUserId, String tableName) {
 
-        this.printLog("persistIcResiBaseInfo");
+        //this.printLog("persistIcResiBaseInfo");
 
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
@@ -1000,7 +1000,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         List<OptionResultDTO> options = null;
 
         log.info("optionsUrl:{}, currUserAgencyId:{}", pureUri, currUserAgencyId);
-        this.printLog("listRemoteOptions");
+        //this.printLog("listRemoteOptions");
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
@@ -1041,7 +1041,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 }
                 nform.setGridId(gridId);
 
-                this.printLog("listRemoteOptions#neighborhoodoption");
+                //this.printLog("listRemoteOptions#neighborhoodoption");
                 log.info("neighborhoodoption:{},{}", currUserAgencyId, gridId);
 
                 options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index bab73c6909..6350f94c54 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -40,10 +40,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.HttpContextUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IcPlatformConstant;
 import com.epmet.constant.IcResiUserConstant;
@@ -73,7 +71,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Date;
@@ -988,7 +985,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
             }
         } catch (Exception ex) {
-            log.warn("listRemoteOptions url:{}", e.getOptionSourceValue());
+            log.error("listRemoteOptions url:{}", e.getOptionSourceValue());
         }
     }