机具回收数量优化

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -16,11 +16,14 @@ import com.kxs.product.biz.service.KxsMachineService;
 import com.kxs.product.biz.service.KxsMachineTransferService;
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
+import com.kxs.system.api.util.ParamResolver;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -216,8 +219,12 @@ public class MachineController {
     @GetMapping("/loadRecoverableData")
     public R loadRecoverableData(@RequestParam("userId") Long userId) {
 
+        Integer reDayCount = ParamResolver.getInteger("MACHINE_RE_DAY_COUNT", 15);
+        LocalDateTime endDay = LocalDate.now().minusDays(reDayCount).atStartOfDay();
         return R.ok(kxsMachineService.count(Wrappers.<KxsMachine>lambdaQuery()
-                .eq(KxsMachine::getStatus, MachineTypeEnum.RECYCLE_STATUS.getType())
+                        .lt(KxsMachine::getRecycleEndTime, endDay)
+                .eq(KxsMachine::getBindStatus, MachineTypeEnum.NO_BIND.getType())
+                .eq(KxsMachine::getIsAct, MachineTypeEnum.NO_ACT.getType())
                 .eq(KxsMachine::getUserId, userId)));
     }