From a2e61fb4b425be2ad62bdf1fef84b11e96ee7e8a Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 13:42:10 +0800 Subject: [PATCH] =?UTF-8?q?POINT=20=20=20USER=20=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PointVerificationLogServiceImpl.java | 14 +++---- .../com/epmet/redis/UserBaseInfoRedis.java | 26 ++++++------ .../service/impl/GridLatestServiceImpl.java | 2 +- .../main/resources/mapper/UserBaseInfoDao.xml | 40 ++++++++++--------- .../main/resources/mapper/UserWechatDao.xml | 8 ++-- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..353751cbc5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -189,14 +189,14 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = - baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - if(NumConstant.ONE < verificationParam.getPageNo()){ + baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); + if(NumConstant.ONE == verificationParam.getPageNo()){ result.setTotalPoint( dataList.stream().mapToInt(o -> o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } @@ -205,17 +205,17 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList()); Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + epmetUserOpenFeignClient.queryUserBaseInfo(userIds); boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){ - WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO(); + WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class); o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString()); - o.setRemark(dataList.get(i).getRemark()); if(userRequestCallback) { //如果是陌生人显示微信昵称 o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName())); } + resultObj.add(o); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ac442388ad..40b34099a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -106,18 +106,19 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = - govOrgOpenFeignClient.getGridNameByGridId(gridParam); + govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ String gridFullName = gridResult.getData().getBelongsGridName(); baseInfo.setRegisteredGridName(gridFullName); StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); - switch(baseInfo.getGender()){ - case NumConstant.ONE_STR : + switch (baseInfo.getGender()) { + case NumConstant.ONE_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); break; - case NumConstant.TWO_STR : + case NumConstant.TWO_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); break; default: @@ -125,18 +126,19 @@ public class UserBaseInfoRedis { } baseInfo.setShowName(buffer.toString()); } - }else{ - //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id - LatestGridInfoResultDTO gridLatest = + } + }else{ + //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id + LatestGridInfoResultDTO gridLatest = gridLatestDao.selectLatestGridInfoByUserId(userId); - if(null != gridLatest){ - baseInfo.setCustomerId(gridLatest.getCustomerId()); - } + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); } - set(baseInfo); - return baseInfo; } + set(baseInfo); + return baseInfo; } + return null; } } \ No newline at end of file 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 c6012384ba..71c4005717 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 @@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..e96b505b09 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -93,10 +93,10 @@