feat: 增加剩余时间和是否超时信息

src/main/java/com/starcharge/wios/controller/WallboxApplyController.java

@@ -36,10 +36,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -78,24 +77,27 @@ public class WallboxApplyController {
         }
         }
         Integer status = order.getStatus();
         Integer status = order.getStatus();
         // 检查订单状态是否在0-43之间
         // 检查订单状态是否在0-43之间
-        if (status >= OrderStatus.DISPATCHING.getType() && status <= OrderStatus.INSTALLING.getType()) {
-            SessionInfo loginUser = tokenService.getUser();
-            String userId = loginUser.getUserId();
-            SupplierStaff infoByAccount = supplierStaffService.getByAccountId(Integer.valueOf(userId));
-            Supplier supplier = supplierService.getById(infoByAccount.getSupplierId());
-            if (supplier == null) {
-                throw new ServiceException("供应商不存在");
-            }
-            WallboxApply wa = new WallboxApply();
-            wa.setSupplierId(Long.valueOf(supplier.getId()));
-            wa.setSupplierTeam(supplier.getName());
-            wa.setOrderId(orderId);
-            wa.setIfEmergency(ifEmergency);
-            wa.setCreateAccount(tokenService.getUser().getUserId());
-            wallboxApplyService.insertWallboxApply(wa);
-            return new BaseResponse<>(true);
-        }
-        throw new ServiceException("订单已在安装中，无法申请");
+        boolean allowed = status >= OrderStatus.DISPATCHING.getType() && status <= OrderStatus.INSTALLING.getType();
+//        if (!allowed) {
+//            throw new ServiceException("订单已在安装中，无法申请");
+//        }
+
+        SessionInfo loginUser = tokenService.getUser();
+        String userId = loginUser.getUserId();
+//        SupplierStaff infoByAccount = supplierStaffService.getByAccountId(Integer.valueOf(userId));
+//        Supplier supplier = supplierService.getById(infoByAccount.getSupplierId());
+//        if (supplier == null) {
+//            throw new ServiceException("供应商不存在");
+//        }
+        WallboxApply wa = new WallboxApply();
+        wa.setSupplierId(2L);
+        wa.setSupplierTeam("服务商-万帮云安装");
+        wa.setOrderId(orderId);
+        wa.setIfEmergency(ifEmergency);
+        wa.setCreateAccount(tokenService.getUser().getUserId());
+        wallboxApplyService.insertWallboxApply(wa);
+        return new BaseResponse<>(true);
+
     }
     }
 
 
     /**
     /**
@@ -109,6 +111,21 @@ public class WallboxApplyController {
     public BaseResponse<List<WallboxApplyInstallListVO>> list(WallboxApplyReqVO req) {
     public BaseResponse<List<WallboxApplyInstallListVO>> list(WallboxApplyReqVO req) {
         List<WallboxApplyInstallListVO> list =
         List<WallboxApplyInstallListVO> list =
                 wallboxApplyService.selectWallboxApplyListFromOrder(WallboxApplyConvert.INSTANCE.convert(req));
                 wallboxApplyService.selectWallboxApplyListFromOrder(WallboxApplyConvert.INSTANCE.convert(req));
+        LocalDateTime currentTime = LocalDateTime.now();
+        for (WallboxApplyInstallListVO apply : list) {
+            Date createdDate = apply.getCreatedTime();
+            LocalDateTime createdTime = LocalDateTime.ofInstant(createdDate.toInstant(), ZoneId.systemDefault());
+            LocalDateTime endTime = createdTime.plusHours(24);
+
+            long remainingHours = currentTime.until(endTime, ChronoUnit.HOURS);
+            remainingHours = Math.max(remainingHours, 0);  // 将剩余小时数限制在0-24之间
+            if (remainingHours == 0) {
+                apply.setIfTimeout(1L);
+            } else {
+                apply.setIfTimeout(0L);
+            }
+            apply.setTimeRemaining(Long.toString(remainingHours));
+        }
         return new BaseResponse<>(list);
         return new BaseResponse<>(list);
     }
     }
 
 
@@ -184,7 +201,7 @@ public class WallboxApplyController {
     @ApiOperation(value = "批量新增")
     @ApiOperation(value = "批量新增")
     @PostMapping
     @PostMapping
     public BaseResponse<Object> add(@RequestBody List<WallboxApply> tWallboxApply) {
     public BaseResponse<Object> add(@RequestBody List<WallboxApply> tWallboxApply) {
-        tWallboxApply.forEach(t->{
+        tWallboxApply.forEach(t -> {
             wallboxApplyService.insertWallboxApply(t);
             wallboxApplyService.insertWallboxApply(t);
         });
         });
         return new BaseResponse<>();
         return new BaseResponse<>();