Merge remote-tracking branch 'remotes/origin/dev' into 市北生产

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);

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());
         }
     }