2轮测试bug: 首次登录创建project时，发送消息携带tenantId

background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserProjectController.java

@@ -55,7 +55,7 @@ public class BackgroundUserProjectController {
      */
     @PostMapping("/defaultProject/{userId}")
     public R<Void> defaultProject(@PathVariable("userId") Long userId) {
-        backgroundUserProjectService.defaultProject(userId);
+        backgroundUserProjectService.defaultProject(userId,null);
         return R.ok();
     }
 

background-user/src/main/java/cn/kdan/compdf/service/BackgroundUserProjectService.java

@@ -38,7 +38,7 @@ public interface BackgroundUserProjectService extends IService<BackgroundUserPro
      * 添加新用户默认项目
      * @param userId 用户id
      */
-    void defaultProject(Long userId);
+    void defaultProject(Long userId,Long tenantId);
 
     /**
      * 编辑项目

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundConvertDataServiceImpl.java

@@ -314,16 +314,13 @@ public class BackgroundConvertDataServiceImpl extends ServiceImpl<BackgroundConv
         List<DashboardDetailedDataDTO> errorRequestDetailedData = this.getErrorRequestDetailedData(queryDTO);
         List<DashboardDetailedDataDTO> dataDTOS = new ArrayList<>();
         for (int i = 0; i < successfulRequestDetailedData.size(); i++) {
-
             int fileTotal = Integer.parseInt(successfulRequestDetailedData.get(i).getYData()) + Integer.parseInt(errorRequestDetailedData.get(i).getYData());
-
             dataDTOS.add(DashboardDetailedDataDTO.builder()
                     .xData(successfulRequestDetailedData.get(i).getXData())
                     .yData(fileTotal == 0 ? "0.00%" : new BigDecimal(String.format("%.2f", Integer.parseInt(errorRequestDetailedData.get(i).getYData()) * 100.00
                             / fileTotal)).toString() + "%")
                     .build());
         }
-        Collections.reverse(dataDTOS);
         return dataDTOS;
     }
 
@@ -559,7 +556,7 @@ public class BackgroundConvertDataServiceImpl extends ServiceImpl<BackgroundConv
         assert b != null;
         if (!b) {
             log.info("开始数据同步");
-            redisTemplate.opsForValue().setIfAbsent(DASHBOARD_SYNC_KEY, "", 60, TimeUnit.MINUTES);
+            redisTemplate.opsForValue().setIfAbsent(DASHBOARD_SYNC_KEY, "", 59, TimeUnit.MINUTES);
             try {
                 this.baseMapper.insertList(list);
             } catch (Exception e) {
@@ -630,10 +627,11 @@ public class BackgroundConvertDataServiceImpl extends ServiceImpl<BackgroundConv
                 throw new CommonException(BackgroundErrorEnum.QUEUE_PARAMETER_ERROR);
             } else if (endDateTime.isAfter(MyLocalDateUtil.timeZoneConversion(LocalDateTime.now(), queryDTO.getTimeZone()).toLocalDate())) {
                 throw new CommonException(BackgroundErrorEnum.QUEUE_PARAMETER_ERROR);
-            } else if (startDateTime.equals(endDateTime)) {
+            }
+//            else if (startDateTime.equals(endDateTime)) {
                 // 开始时间等于结束时间
                 endDateTime = endDateTime.plusDays(1);
-            }
+//            }
 //            else if (ChronoUnit.DAYS.between(startDateTime, endDateTime) > 30) {
 //                // 开始时间和结束时间大于30天
 //                startDateTime = endDateTime.minus(30, ChronoUnit.DAYS);

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserBalanceServiceImpl.java

@@ -218,7 +218,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             userBalance.setTenantId(asset.getTenantId());
             userBalance.setUserId(userService.getUserId(asset.getTenantId()));
             userBalance.setDate(LocalDateTime.now());
-            userBalance.setDescriptionType(3);
+            userBalance.setDescriptionType(9);
             userBalance.setDescription("Files consumed"); // TODO 枚举值
             userBalance.setRemainingFiles(newestPlanRemainingFiles - asset.getAsset());
             userBalance.setBalanceChange(asset.getAsset());
@@ -244,12 +244,14 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             userBalance.setTenantId(cleanFreeAsset.getTenantId());
             userBalance.setUserId(userService.getUserId(cleanFreeAsset.getTenantId()));
             userBalance.setDate(LocalDateTime.now());
-            userBalance.setDescriptionType(3);
+            userBalance.setDescriptionType(9);
             userBalance.setDescription("Files consumed"); // TODO 枚举值
             userBalance.setRemainingFiles(newestPlanRemainingFiles - cleanFreeAsset.getAsset());
             userBalance.setBalanceChange(cleanFreeAsset.getAsset());
             userBalance.setChangeType(3);
 
+            this.save(userBalance);
+
             Integer newestPlanAddFreeNum = this.baseMapper.selectNewestPlanAddFreeNum(cleanFreeAsset.getTenantId());
             backgroundUserRemainService.cleanFreeAssetTotal(cleanFreeAsset.getTenantId(), newestPlanAddFreeNum);
 

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserProjectServiceImpl.java

@@ -110,7 +110,7 @@ public class BackgroundUserProjectServiceImpl extends ServiceImpl<BackgroundUser
      * @param userId 用户id
      */
     @Override
-    public void defaultProject(Long userId) {
+    public void defaultProject(Long userId,Long tenantId) {
         // 验证是否已生成默认项目
         LambdaQueryWrapper<BackgroundUserProject> eq = new LambdaQueryWrapper<BackgroundUserProject>()
                 .eq(BackgroundUserProject::getStatus, 1)
@@ -124,6 +124,7 @@ public class BackgroundUserProjectServiceImpl extends ServiceImpl<BackgroundUser
         // 新增
         BackgroundUserProject backgroundUserProject = new BackgroundUserProject();
         backgroundUserProject.setUserId(userId);
+        backgroundUserProject.setTenantId(tenantId);
         backgroundUserProject.setProjectName(APIKeysEnum.DEFAULT_PROJECT);
         backgroundUserProject.setProjectKey(APIKeysEnum.PUBLIC_KEY + MD5Util.MD5Encode(UUID.randomUUID().toString()));
         backgroundUserProject.setSecretKey(APIKeysEnum.SECRET_KEY + MD5Util.MD5Encode(UUID.randomUUID().toString()));

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserServiceImpl.java

@@ -72,7 +72,7 @@ public class BackgroundUserServiceImpl extends ServiceImpl<BackgroundUserMapper,
         //更新登录用户的登陆时间
         if (backgroundUser.getFirstLoginTime() == null) {
             // 首次登录创建默认项目
-            backgroundUserProjectService.defaultProject(backgroundUser.getId());
+            backgroundUserProjectService.defaultProject(backgroundUser.getId(),backgroundUser.getTenantId());
             backgroundUser.setFirstLoginTime(LocalDateTime.now());
         }
         backgroundUser.setLastLoginTime(new Date());

background-user/src/main/java/cn/kdan/compdf/vo/BackgroundUserBalanceVO.java

@@ -30,7 +30,7 @@ public class BackgroundUserBalanceVO {
     /**
      * 文件数量余额
      */
-    @ExcelProperty(value = "Remaing files", index = 3)
+    @ExcelProperty(value = "Remaining files", index = 3)
     private Integer remainingFiles;
     /**
      * 过期时间

background-user/src/main/resources/mapper/BackgroundUserBalanceMapper.xml

@@ -28,7 +28,7 @@
         limit 1
     </select>
     <select id="selectNewestPlanAddFreeNum" resultType="java.lang.Integer">
-        select remaining_files
+        select balance_change
         from background_user_balance
         where tenant_id = #{tenantId}
         and description_type = 3