From 70e1146ac6920a6607b51eaa2ef22555c0495161 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 16:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index b6a4265..fdd88a3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -47,11 +47,11 @@
// @Scheduled(cron = "0 0 0 2 * ?")
// 每天凌晨12点执行的定时任务
- @Scheduled(cron = "0 0 12 2 * ?")
- // 每30秒执行一次的定时任务
- @Scheduled(cron = "0/30 * * * * ?")
+
+@Scheduled(cron = "0 0 12 1 * ?")
public void taskMonth() {
try {
+ System.err.println("执行定时任务生成账单");
// 获取上个月的开始和结束日期
LocalDate firstDayOfLastMonth = LocalDate.now().minusMonths(1).
withDayOfMonth(2);
@@ -67,6 +67,7 @@
.collect(Collectors.joining()); // 将其连接成一个字符串
tChargingBill.setCode("JSD"+string+randomDigits );
tChargingBill.setType(1);
+ tChargingBill.setSiteId(0);
tChargingBill.setBillTime(LocalDateTime.now());
tChargingBill.setStatus(1);
tChargingBill.setOrderState(2);
@@ -74,13 +75,13 @@
// 每月二号给每个站点生成上月账单
List<Integer> collect = siteClient.getSiteAll().getData().stream().map(Site::getId).collect(Collectors.toList());
List<TChargingBill> tChargingBills = new ArrayList<>();
- for (int i = 1; i <= collect.size(); i++) {
+ for (int i = 0; i < collect.size(); i++) {
TChargingBill tChargingBill1 = new TChargingBill();
Random random1 = new Random();
String randomDigits1 = random1.ints(10, 0, 10) // 生成10个随机数字，范围在0-9
.mapToObj(String::valueOf)
.collect(Collectors.joining()); // 将其连接成一个字符串
- tChargingBill1.setCode("JSD"+string+randomDigits1+i );
+ tChargingBill1.setCode("JSD"+string+randomDigits1+(i+1) );
tChargingBill1.setType(2);
tChargingBill1.setSiteId(collect.get(i));
tChargingBill1.setBillTime(LocalDateTime.now());
@@ -88,6 +89,7 @@
tChargingBill1.setOrderState(2);
tChargingBills.add(tChargingBill1);
}
+ System.err.println("列表"+tChargingBills);
if (!tChargingBills.isEmpty())chargingBillService.saveBatch(tChargingBills);
} catch (Exception e) {
@@ -95,7 +97,7 @@
}
}
// 每个月最后一天23点执行的定时任务
- @Scheduled(cron = "0 0 23 L * ?")
+ @Scheduled(cron = "0 0 12 1 * ?")
public void taskLastDay() {
try {
// 获取上个月的开始和结束日期
--
Gitblit v1.7.1