From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
index 42b3ddb..fd4f410 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
@@ -43,7 +43,7 @@
      * 每隔一分钟去处理的定时任务
      */
     @Scheduled(fixedRate = 60000)
-    public void taskMinute(){
+    public void taskMinute() {
         try {
             //定时修改排课状态
             coursePackageSchedulingService.taskSetStatus();
@@ -51,14 +51,15 @@
             e.printStackTrace();
         }
     }
+
     /**
      * 每隔一分钟去处理的定时任务   预约课时
      */
     @Scheduled(cron = "0 0 18 * * ?")
-    public void pushOne(){
+    public void pushOne() {
         try {
             Calendar instance = Calendar.getInstance();
-            instance.add(Calendar.DATE,1);
+            instance.add(Calendar.DATE, 1);
             Date time = instance.getTime();
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             String format1 = format.format(time);
@@ -66,7 +67,7 @@
             List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new LambdaQueryWrapper<CoursePackageScheduling>().like(CoursePackageScheduling::getClassDate, format1));
             for (CoursePackageScheduling coursePackageScheduling : list) {
                 CoursePackageStudent one = coursePackageStudentService.getOne(new LambdaQueryWrapper<CoursePackageStudent>().eq(CoursePackageStudent::getCoursePackageSchedulingId, coursePackageScheduling.getId()));
-                if(one!=null && one.getReservationStatus()==1){
+                if (one != null && one.getReservationStatus() == 1) {
                     Integer appUserId = one.getAppUserId();
 
                     //调用推送
@@ -75,9 +76,9 @@
                     headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
                     String s1 = appUserId + "_" + "Class";
                     //定时修改排课状态
-                    String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id="+s1, String.class);
+                    String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id=" + s1, String.class);
                     JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
-                    if(jsonObject1.getIntValue("code") != 200){
+                    if (jsonObject1.getIntValue("code") != 200) {
                         System.err.println(jsonObject1.getString("msg"));
                     }
                 }
@@ -89,14 +90,21 @@
     }
 
 
-
     /**
      * 零时任务
      */
-    @Scheduled(cron = "0 0 0 * * *")
-    public void zeroTask(){
-        //定时添加排课数据
-//        coursePackageSchedulingService.taskAddData();
+    @Scheduled(cron = "0 0 23 * * *")
+    public void zeroTask() {
         coursePackageSchedulingService.cancel();
     }
+
+
+    /**
+     * 每周一执行的定时任务
+     */
+    @Scheduled(cron = "0 0 0 * * 2")
+    public void weekTask() {
+        //定时添加排课数据
+        coursePackageSchedulingService.taskCoursePackageScheduling();
+    }
 }

--
Gitblit v1.7.1