Browse Source

Merge remote-tracking branch 'origin/master'

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

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

@@ -87,4 +87,8 @@ public interface TaskRemoteService {
 	//新增待填写月报定时推送(推送老师)
 	//新增待填写月报定时推送(推送老师)
 	@GetMapping("task/pushNeedPostReport")
 	@GetMapping("task/pushNeedPostReport")
 	void pushNeedPostReport();
 	void pushNeedPostReport();
+
+	//预生成待提交月报
+	@GetMapping("task/createEvaluate")
+	void createEvaluate();
 }
 }

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

@@ -110,4 +110,9 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 	public void pushNeedPostReport() {
 	public void pushNeedPostReport() {
 		logger.info("新增待填写月报推送失败");
 		logger.info("新增待填写月报推送失败");
 	}
 	}
+
+	@Override
+	public void createEvaluate() {
+		logger.info("预生成待提交月报失败");
+	}
 }
 }

+ 19 - 0
mec-task/src/main/java/com/ym/mec/task/jobs/CreateEvaluateTask.java

@@ -0,0 +1,19 @@
+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;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CreateEvaluateTask extends BaseTask {
+
+    @Autowired
+    private TaskRemoteService taskRemoteService;
+
+    @Override
+    public void execute() throws TaskException {
+        taskRemoteService.createEvaluate();
+    }
+}

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

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.controller.BaseController;
 
 
+import java.util.Date;
+
 @RequestMapping("task")
 @RequestMapping("task")
 @RestController
 @RestController
 public class TaskController extends BaseController {
 public class TaskController extends BaseController {
@@ -165,4 +167,10 @@ public class TaskController extends BaseController {
 		courseScheduleEvaluateService.pushNeedPostReport();
 		courseScheduleEvaluateService.pushNeedPostReport();
 	}
 	}
 
 
+	//定时预生成待提交月报
+	@GetMapping("/createEvaluate")
+	public void createEvaluate(){
+		courseScheduleEvaluateService.createEvaluate(new Date());
+	}
+
 }
 }