Browse Source

1、陪练课调整
2、付费陪练课可预约时间调整

Joburgess 5 năm trước cách đây
mục cha
commit
74b15f043e

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3383,7 +3383,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Override
     public void pushStudyReport(Date expiredDate, String pushType) {
         if(Objects.isNull(expiredDate)){
-            throw new BizException("请指定推送报告的截至日期");
+            expiredDate=new Date();
         }
 
         if(StringUtils.isBlank(pushType)){

+ 4 - 0
mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -75,4 +75,8 @@ public interface TaskRemoteService {
 	//更新历史陪练课至已结束
 	@GetMapping("task/updateHistoryPracticeGroupStatus")
 	public void updateHistoryPracticeGroupStatus();
+
+	//练习报告定时推送
+	@GetMapping("task/pushStudyReport")
+	void pushStudyReport();
 }

+ 5 - 0
mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -95,4 +95,9 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 	public void updateHistoryPracticeGroupStatus() {
 		logger.info("历史网管课状态更新失败");
 	}
+
+	@Override
+	public void pushStudyReport() {
+		logger.info("练习报告推送失败");
+	}
 }

+ 21 - 0
mec-task/src/main/java/com/ym/mec/task/jobs/StudyReportTask.java

@@ -0,0 +1,21 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/2/29
+ */
+public class StudyReportTask extends BaseTask {
+
+    @Autowired
+    private TaskRemoteService taskRemoteService;
+
+    @Override
+    public void execute() throws TaskException {
+        taskRemoteService.pushStudyReport();
+    }
+}

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -144,4 +144,10 @@ public class TaskController extends BaseController {
 		practiceGroupService.updateHistoryPracticeGroupStatus();
 	}
 
+	//练习报告定时推送
+	@GetMapping("/pushStudyReport")
+	public void pushStudyReport(){
+		practiceGroupService.pushStudyReport(null, "ALL");
+	}
+
 }