数据同步bug修改

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

@@ -45,8 +45,8 @@ public class BackgroundUserBalanceController {
      * 获取账户消费充值记录
      */
     @GetMapping("/getBalanceRecordList")
-    public R<IPage<BackgroundUserBalanceVO>> getBalanceRecordList(@RequestParam("page") Integer page, @RequestParam("size") Integer size) {
-        IPage<BackgroundUserBalanceVO> balanceRecordList = backgroundUserBalanceService.getBalanceRecordList(TokenUtil.getRequestHeader().getId(), page, size);
+    public R<IPage<BackgroundUserBalanceVO>> getBalanceRecordList(@RequestParam("page") Integer page, @RequestParam("size") Integer size,Integer timeZone) {
+        IPage<BackgroundUserBalanceVO> balanceRecordList = backgroundUserBalanceService.getBalanceRecordList(TokenUtil.getRequestHeader().getId(), page, size,timeZone);
         return R.ok(balanceRecordList);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.kdan.compdf.controller.v1;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.kdan.compdf.base.R;
 import cn.kdan.compdf.dto.AddNewProjectDTO;
 import cn.kdan.compdf.dto.EditProjectDTO;
@@ -31,8 +32,11 @@ public class BackgroundUserProjectController {
      * 获取API Keys列表
      */
     @GetMapping("/getProjectList")
-    public R<List<BackgroundUserProjectVO>> getProjectList() {
-        return R.ok(backgroundUserProjectService.getProjectList(TokenUtil.getRequestHeader().getId()));
+    public R<List<BackgroundUserProjectVO>> getProjectList(Integer timeZone) {
+        if (ObjectUtil.isEmpty(timeZone)){
+            timeZone = 0;
+        }
+        return R.ok(backgroundUserProjectService.getProjectList(TokenUtil.getRequestHeader().getId(),timeZone));
     }
 
     /**

background-user/src/main/java/cn/kdan/compdf/entity/BackgroundUserBalance.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -32,7 +34,7 @@ public class BackgroundUserBalance extends BaseEntity{
     /**
      * 日期
      */
-    private Date date;
+    private LocalDateTime date;
     /**
      * 充值/消费具体类型1、Package，2、Subscription，3、Free，9、Files consumed
      */

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

@@ -37,7 +37,7 @@ public interface BackgroundUserBalanceService extends IService<BackgroundUserBal
      * @param size 当前页行数
      * @return 账户消费充值记录
      */
-    IPage<BackgroundUserBalanceVO> getBalanceRecordList(Long userId, Integer page, Integer size);
+    IPage<BackgroundUserBalanceVO> getBalanceRecordList(Long userId, Integer page, Integer size,Integer timeZone);
 
     /**
      * 账户消费充值记录导出

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

@@ -26,7 +26,7 @@ public interface BackgroundUserProjectService extends IService<BackgroundUserPro
      * 获取API Keys列表
      * @return project列表
      */
-    List<BackgroundUserProjectVO> getProjectList(Long userId);
+    List<BackgroundUserProjectVO> getProjectList(Long userId,Integer timeZone);
 
     /**
      * 添加新项目

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

@@ -14,6 +14,7 @@ import cn.kdan.compdf.mapper.BackgroundUserBalanceMapper;
 import cn.kdan.compdf.service.BackgroundUserBalanceService;
 import cn.kdan.compdf.service.BackgroundUserRemainService;
 import cn.kdan.compdf.service.BackgroundUserService;
+import cn.kdan.compdf.utils.MyLocalDateUtil;
 import cn.kdan.compdf.vo.BackgroundUserBalanceVO;
 import cn.kdan.compdf.vo.BackgroundUserPackageBalanceVO;
 import com.alibaba.excel.EasyExcel;
@@ -33,6 +34,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
@@ -88,7 +90,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
      * @return 账户消费充值记录
      */
     @Override
-    public IPage<BackgroundUserBalanceVO> getBalanceRecordList(Long userId, Integer page, Integer size) {
+    public IPage<BackgroundUserBalanceVO> getBalanceRecordList(Long userId, Integer page, Integer size,Integer timeZone) {
         LambdaQueryWrapper<BackgroundUserBalance> eq = new LambdaQueryWrapper<BackgroundUserBalance>()
                 .eq(BackgroundUserBalance::getUserId, userId)
                 .orderByDesc(BackgroundUserBalance::getDate);
@@ -102,6 +104,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
         List<BackgroundUserBalanceVO> records = Lists.newArrayList();
         if (CollectionUtil.isNotEmpty(backgroundUserBalancePage.getRecords())) {
             backgroundUserBalancePage.getRecords().forEach(c -> {
+                c.setDate(MyLocalDateUtil.timeZoneConversion(c.getDate(),timeZone));
                 BackgroundUserBalanceVO backgroundUserBalanceVO = new BackgroundUserBalanceVO();
                 BeanUtil.copyProperties(c, backgroundUserBalanceVO);
                 if (c.getChangeType() == 1) {
@@ -190,7 +193,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
                     BackgroundUserBalance backgroundUserBalance = new BackgroundUserBalance();
                     backgroundUserBalance.setUserId(userId);
                     backgroundUserBalance.setTenantId(item.getTenantId());
-                    backgroundUserBalance.setDate(new Date());
+                    backgroundUserBalance.setDate(LocalDateTime.now());
                     backgroundUserBalance.setDescriptionType(9);
                     backgroundUserBalance.setDescription("Files consumed");
                     backgroundUserBalance.setChangeType(2);
@@ -218,7 +221,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
             BackgroundUserBalance userBalance = new BackgroundUserBalance();
             userBalance.setTenantId(asset.getTenantId());
             userBalance.setUserId(userService.getUserId(asset.getTenantId()));
-            userBalance.setDate(new Date());
+            userBalance.setDate(LocalDateTime.now());
             userBalance.setDescriptionType(3);
             userBalance.setDescription("Free过期资产");
             userBalance.setRemainingFiles(newestPlanRemainingFiles - asset.getAsset());
@@ -229,7 +232,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
 
             newestPlanRemainingFiles = getNewestPlanRemainingFiles(asset.getTenantId());
             userBalance.setId(null);
-            userBalance.setDate(new Date());
+            userBalance.setDate(userBalance.getDate().plusSeconds(1L));
             userBalance.setDescriptionType(3);
             userBalance.setDescription("Free增加资产");
             userBalance.setRemainingFiles(newestPlanRemainingFiles + freeAsset);

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

@@ -15,6 +15,7 @@ import cn.kdan.compdf.mapper.BackgroundUserProjectMapper;
 import cn.kdan.compdf.service.BackgroundUserProjectService;
 import cn.kdan.compdf.service.BackgroundUserService;
 import cn.kdan.compdf.utils.MD5Util;
+import cn.kdan.compdf.utils.MyLocalDateUtil;
 import cn.kdan.compdf.vo.BackgroundUserProjectVO;
 import cn.kdan.compdf.vo.ProjectQueryVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -54,7 +55,7 @@ public class BackgroundUserProjectServiceImpl extends ServiceImpl<BackgroundUser
      * @return project列表
      */
     @Override
-    public List<BackgroundUserProjectVO> getProjectList(Long userId) {
+    public List<BackgroundUserProjectVO> getProjectList(Long userId,Integer timeZone) {
         // 查找用户下面状态正常的project记录
         LambdaQueryWrapper<BackgroundUserProject> eq = new LambdaQueryWrapper<BackgroundUserProject>()
                 .eq(BackgroundUserProject::getStatus, 1)
@@ -67,7 +68,7 @@ public class BackgroundUserProjectServiceImpl extends ServiceImpl<BackgroundUser
             list.forEach(c -> {
                 BackgroundUserProjectVO backgroundUserProjectVO = new BackgroundUserProjectVO();
                 BeanUtil.copyProperties(c, backgroundUserProjectVO);
-                backgroundUserProjectVO.setCreateDate(DateUtil.format(c.getCreateDate(), DateTImeFormatEnum.DATE_TIME));
+                backgroundUserProjectVO.setCreateDate(DateUtil.format(MyLocalDateUtil.timeZoneConversion(c.getCreateDate(),timeZone), DateTImeFormatEnum.DATE_TIME));
                 backgroundUserProjectVOList.add(backgroundUserProjectVO);
             });
             return backgroundUserProjectVOList;