车辆排名

performance-api/src/main/java/com/clx/performance/param/app/integral/DriverPageIntegralTruckRankParam.java

 package com.clx.performance.param.app.integral;
 
 import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 @NoArgsConstructor
 public class DriverPageIntegralTruckRankParam extends PageParam {
 
+    @ApiModelProperty(value = "车牌列表", hidden = true)
+    List<String> truckNoList;
 
 }

performance-web/src/main/java/com/clx/performance/extranal/user/UserService.java

 package com.clx.performance.extranal.user;
 
+import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
 import com.msl.common.base.Optional;
 import com.msl.user.param.user.external.PageProductUsersParam;
 import com.msl.user.vo.company.external.ListUserCompanyVo;
@@ -32,4 +33,6 @@ public interface UserService {
 
     Optional<List<ListUserCompanyVo>> listUserCompany(Long userNo);
 
+    Optional<List<DriverTruckAppVo>> driverTruckList(Long userNo);
+
 }

performance-web/src/main/java/com/clx/performance/extranal/user/impl/UserServiceImpl.java

 package com.clx.performance.extranal.user.impl;
 
 import com.clx.performance.extranal.user.UserService;
+import com.clx.user.feign.TruckFeign;
+import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
 import com.msl.common.base.Optional;
+import com.msl.common.result.Result;
 import com.msl.user.param.user.external.PageProductUsersParam;
 import com.msl.user.vo.company.external.ListUserCompanyVo;
 import com.msl.user.vo.user.UserVo;
@@ -9,6 +12,7 @@ import com.msl.user.vo.user.external.PageProductUserVo;
 import com.msl.user.vo.user.external.UserDetailInfoVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,6 +21,10 @@ import java.util.List;
 @Slf4j
 @AllArgsConstructor
 public class UserServiceImpl implements UserService {
+
+    @Autowired
+    private TruckFeign truckFeign;
+
     @Override
     public Optional<UserVo> getUserByNo(Long userNo, boolean containDeleted) {
         return null;
@@ -41,4 +49,14 @@ public class UserServiceImpl implements UserService {
     public Optional<List<ListUserCompanyVo>> listUserCompany(Long userNo) {
         return null;
     }
+
+    @Override
+    public Optional<List<DriverTruckAppVo>> driverTruckList(Long userNo){
+
+        return Optional.ofNullable(truckFeign.driverTruckList(userNo))
+                .filter(Result::succeed)
+                .map(Result::getData);
+
+    }
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/IntegralTruckServiceImpl.java

 package com.clx.performance.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.IntegralRecordDao;
 import com.clx.performance.dao.IntegralStatisticsDao;
 import com.clx.performance.dao.IntegralTruckDao;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.extranal.user.UserService;
 import com.clx.performance.model.IntegralRecord;
 import com.clx.performance.model.IntegralStatistics;
 import com.clx.performance.model.IntegralTruck;
@@ -16,7 +18,10 @@ import com.clx.performance.param.pc.PageIntegralTruckRankParam;
 import com.clx.performance.service.*;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.pc.IntegralTruckVO;
+import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
 import com.clx.user.vo.feign.DriverInfoFeignVo;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +58,9 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
     @Autowired
     private IntegralMqHandlerService integralMqHandlerService;
 
+    @Autowired
+    private UserService userService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveTruck(IntegralTruckAddParam param) {
@@ -153,9 +161,19 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
     public IPage<IntegralTruckVO> driverPageTruckRank(DriverPageIntegralTruckRankParam param) {
         String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
 
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        // 查找司机车辆
+        List<DriverTruckAppVo> driverTruckList = userService.driverTruckList(userNo).orNull();
+        if (driverTruckList == null || driverTruckList.isEmpty()) {return new Page<>();}
+
+        List<String> truckNoList = driverTruckList.stream().map(item -> item.getTruckNo()).collect(Collectors.toList());
+        param.setTruckNoList(truckNoList);
+
         IPage<IntegralTruckVO> page = integralTruckDao.driverPageTruckRank(param);
 
-        List<String> truckNoList = page.getRecords().stream().map(item -> item.getTruckNo()).collect(Collectors.toList());
+        truckNoList = page.getRecords().stream().map(item -> item.getTruckNo()).collect(Collectors.toList());
         if (!truckNoList.isEmpty()) {
             List<IntegralStatistics> statisticsList = integralStatisticsDao.selectListByStatisticsDateAndTruckNoList(time, truckNoList);
             Map<String, Integer> rankMap = statisticsList.stream().collect(Collectors.toMap(item -> item.getTruckNo(), item -> item.getRank()));