From fc0cf43a3113e5641ad8252f1ca59a79944514a1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 6 Jul 2020 21:05:41 +0800 Subject: [PATCH] =?UTF-8?q?getlatestgridinfo=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grid/service/impl/ResiMineGridServiceImpl.java | 12 +++++++----- .../epmet/dto/result/LatestGridInfoResultDTO.java | 6 ++++++ .../epmet/service/impl/GridLatestServiceImpl.java | 10 ++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 61f9e675b3..10d9b898f5 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -1,8 +1,8 @@ package com.epmet.modules.grid.service.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -43,20 +43,22 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { **/ @Override public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) { + LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO(); if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) { - logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL)); + logger.warn(String.format("居民端获取用户最近访问的网格失败:tokenDto is null or userId is null")); throw new RenException(ModuleConstant.USER_NOT_NULL); } if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){ - logger.error(String.format("居民端【%s】获取用户最近访问的网格失败,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL)); + logger.warn(String.format("居民端获取用户最近访问的网格失败,userId:%s,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL)); throw new RenException(ModuleConstant.FOR_RESI_CALL); } + logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(tokenDto))); Result userResult=epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId()); if(userResult.success()&&null!=userResult.getData()){ return userResult.getData(); } - logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg())); - return null; + logger.warn(String.format("居民端获取用户最近访问网格失败,调用epmet-user-server服务返回%s",JSON.toJSONString(userResult))); + return latestGridInfoResultDTO; } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java index 829a1cd2d5..9daa47e68f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java @@ -22,4 +22,10 @@ public class LatestGridInfoResultDTO implements Serializable { * 用户最后一次访问的网格 */ private String gridId; + + public LatestGridInfoResultDTO(){ + this.setCustomerId(""); + this.setGridId(""); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index a14a1b002c..304924b3dc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.GridVisitedConstant; import com.epmet.dao.GridLatestDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; @@ -149,13 +147,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getLatestGridInfoByUserId(String userId) { - if(StringUtils.isBlank(userId)){ - logger.error(GridVisitedConstant.USER_ID_NOTNULL); - throw new RenException(GridVisitedConstant.USER_ID_NOTNULL); - } - LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId); + LatestGridInfoResultDTO latestGridInfoResultDTO= baseDao.selectLatestGridInfoByUserId(userId); if (null == latestGridInfoResultDTO) { - return new Result<>(); + return new Result().ok(new LatestGridInfoResultDTO()); } return new Result().ok(latestGridInfoResultDTO); }