From 9160b7eef1e623c704b9bce00e4d21c9bdcaef7c Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 28 Jul 2020 17:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/PointVerificationFormDTO.java | 4 +- .../form/WorkPointVerificationFormDTO.java | 4 +- .../controller/AdjustmentController.java | 18 ++++++ .../epmet/controller/ExchangeController.java | 28 ++++++++++ .../epmet/dao/PointVerificationLogDao.java | 2 +- .../impl/PointVerificationLogServiceImpl.java | 19 ++++++- .../UserPointStatisticalDailyServiceImpl.java | 26 +++++---- .../impl/UserPointTotalServiceImpl.java | 27 +++++---- .../mapper/UserPointStatisticalDailyDao.xml | 56 ++++++++++--------- .../epmet/feign/EpmetUserOpenFeignClient.java | 4 +- .../service/impl/GridLatestServiceImpl.java | 3 +- .../main/resources/mapper/UserWechatDao.xml | 1 + 12 files changed, 134 insertions(+), 58 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java index 4a5aff0a09..7920d68c66 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java @@ -44,10 +44,12 @@ public class PointVerificationFormDTO implements Serializable { @NotBlank(message = "当前工作人员Id不能为空", groups = PointVerificationGroup.class) private String operatorId; - + @NotBlank(message = "缺失经度信息" , groups = PointVerificationGroup.class) private String longitude; + @NotBlank(message = "缺失维度信息" , groups = PointVerificationGroup.class) private String dimension; + @NotBlank(message = "缺失地址信息" , groups = PointVerificationGroup.class) private String address; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java index 8741ae49c6..c9cbe06642 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java @@ -26,7 +26,7 @@ public class WorkPointVerificationFormDTO implements Serializable { private String timeParam; @Min(1) - private Integer pageNo; + private Integer pageNo = 1; - private Integer pageSize; + private Integer pageSize = 20; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 0f2876f74f..0380836896 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -1,10 +1,13 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CustomerUserFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.form.PointAdjustmentFormDTO; import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; import com.epmet.dto.result.PointAdjustmentResultDTO; @@ -69,5 +72,20 @@ public class AdjustmentController { ValidatorUtils.validateEntity(param, IssueInitiatorFormDTO.UserIdGroup.class); return new Result>().ok(pointAdjustmentLogService.adjustRecord(param)); } + + /** + * @Description 积分调整 + * @param param + * @return + * @author wangc + * @date 2020.07.27 13:52 + **/ + @PostMapping("adjust") + public Result adjustPoint(@LoginUser TokenDto token, @RequestBody PointAdjustmentFormDTO param){ + param.setOperatorId(token.getUserId()); + ValidatorUtils.validateEntity(param, PointAdjustmentFormDTO.PointAdjustmentGroup.class); + pointAdjustmentLogService.adjustPoint(param); + return new Result(); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java index 8f81e46de2..5b1445db95 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java @@ -1,5 +1,16 @@ package com.epmet.controller; +import com.epmet.common.token.annotation.Login; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.PointVerificationFormDTO; +import com.epmet.dto.result.PointVerificationResultDTO; +import com.epmet.service.PointVerificationLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,5 +23,22 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("work/exchange") public class ExchangeController { + @Autowired + private PointVerificationLogService pointVerificationLogService; + + /** + * @Description 积分核销 + * @param verificationParam + * @return + * @author wangc + * @date 2020.07.27 14:03 + **/ + @PostMapping("execute") + public Result execute(@LoginUser TokenDto token, @RequestBody PointVerificationFormDTO verificationParam){ + verificationParam.setOperatorId(token.getUserId()); + ValidatorUtils.validateEntity(verificationParam, PointVerificationFormDTO.PointVerificationGroup.class); + return new Result().ok(pointVerificationLogService.verifyPoint(verificationParam)); + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java index 9138df614f..5b90380b88 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java @@ -54,5 +54,5 @@ public interface PointVerificationLogDao extends BaseDao selectStaffVerificationLog(String staffId, Date startDate, Date endDate); + List selectStaffVerificationLog(@Param("staffId") String staffId, @Param("startDate") Date startDate,@Param("endDate") Date endDate); } \ No newline at end of file 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 0cfe6d642f..7a80b9b3c8 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 @@ -185,11 +185,24 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - result.setTotalPoint( - dataList.stream().mapToInt(o -> o.getPoint()).sum() - ); + 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(); + if(toIndex > dataList.size()) { + toIndex = dataList.size(); + } + dataList = dataList.subList(fromIndex,toIndex); + } + List userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList()); Result> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 851a65ecca..51537b8fac 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -147,19 +147,24 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl rankList = baseDao.selectPointRankWithinTimeZone(pointRankFormDTO.getCustomerId(),pointRankFormDTO.getTimeDimension(),dimVal); if(null == rankList || rankList.isEmpty()){ - o.setMyPoint(NumConstant.ZERO); - o.setMyRanking(NumConstant.ZERO); - - return result; + if(NumConstant.ONE < pointRankFormDTO.getPageNo()){ + return result; + }else { + o.setMyPoint(NumConstant.ZERO); + o.setMyRanking(NumConstant.ZERO); + result.add(o); + return result; + } } //如果请求的是第一页 if(NumConstant.ONE == pointRankFormDTO.getPageNo()) { - ResiPointRankResultDTO myself = - rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get(); - if (null != myself) { + ResiPointRankResultDTO myself = null; + Optional opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst(); + if(opt.isPresent()){ + myself = opt.get(); o.setMyPoint(myself.getTotalPoint()); o.setMyRanking(myself.getRank()); - } else { + }else{ o.setMyPoint(NumConstant.ZERO); if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) { o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE); @@ -167,8 +172,9 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl rankList.size()) { toIndex = rankList.size(); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 741e5ad54f..623cfb48f7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -156,29 +156,34 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get(); - if (null != myself) { + ResiPointRankResultDTO myself = null; + Optional opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst(); + if(opt.isPresent()){ + myself = opt.get(); o.setMyPoint(myself.getTotalPoint()); o.setMyRanking(myself.getRank()); } else { - if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) { o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE); } else { o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank()); } } - int fromIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize(); - int toIndex = (pointRankFormDTO.getPageNo() + 1) * pointRankFormDTO.getPageSize(); + + int fromIndex = (pointRankFormDTO.getPageNo() - 1) * pointRankFormDTO.getPageSize(); + int toIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize(); if(toIndex > rankList.size()) { toIndex = rankList.size(); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index f8a5d074ec..633b3f75fa 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -25,38 +25,42 @@ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index b70d1fcf07..70116e6e91 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -24,8 +24,8 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class) +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class) public interface EpmetUserOpenFeignClient { /** 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 a3b1a97331..c6012384ba 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 @@ -194,8 +194,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl { - if(StringUtils.isBlank(info.getUserName())){ - info.setUserName(ModuleConstant.EMPTY_STR); + if(StringUtils.isNotBlank(info.getUserId())){ UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId()); if(null != cache) { info.setRegisteredGrid(cache.getRegisteredGridName()); 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 d3edc68319..cfacc58191 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 @@ -103,6 +103,7 @@ user_base_info base on wechat.USER_ID = base.USER_ID WHERE wechat.DEL_FLAG = '0' + AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME ]]> '') wechat.USER_ID = #{item}