sunyj 9 лет назад
Родитель
Сommit
a7f7916c80

+ 2 - 2
src/main/java/com/uas/report/controller/ScheduleController.java

@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.report.controller.schedule.model.TaskInformation;
-import com.uas.report.controller.schedule.service.TaskService;
+import com.uas.report.schedule.model.TaskInformation;
+import com.uas.report.schedule.service.TaskService;
 import com.uas.report.service.FileService;
 
 @Controller

+ 3 - 1
src/main/java/com/uas/report/controller/schedule/model/DailyTaskInformation.java → src/main/java/com/uas/report/schedule/model/DailyTaskInformation.java

@@ -1,9 +1,11 @@
-package com.uas.report.controller.schedule.model;
+package com.uas.report.schedule.model;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Objects;
 
+import com.uas.report.schedule.service.Executable;
+
 /**
  * 每天定时任务
  * 

+ 3 - 1
src/main/java/com/uas/report/controller/schedule/model/TaskInformation.java → src/main/java/com/uas/report/schedule/model/TaskInformation.java

@@ -1,7 +1,9 @@
-package com.uas.report.controller.schedule.model;
+package com.uas.report.schedule.model;
 
 import java.util.Objects;
 
+import com.uas.report.schedule.service.Executable;
+
 /**
  * 定时任务信息
  * 

+ 1 - 1
src/main/java/com/uas/report/controller/schedule/model/TaskLog.java → src/main/java/com/uas/report/schedule/model/TaskLog.java

@@ -1,4 +1,4 @@
-package com.uas.report.controller.schedule.model;
+package com.uas.report.schedule.model;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

+ 1 - 1
src/main/java/com/uas/report/controller/schedule/model/Executable.java → src/main/java/com/uas/report/schedule/service/Executable.java

@@ -1,4 +1,4 @@
-package com.uas.report.controller.schedule.model;
+package com.uas.report.schedule.service;
 
 /**
  * 可执行的,用于执行定时任务

+ 2 - 2
src/main/java/com/uas/report/controller/schedule/service/TaskService.java → src/main/java/com/uas/report/schedule/service/TaskService.java

@@ -1,8 +1,8 @@
-package com.uas.report.controller.schedule.service;
+package com.uas.report.schedule.service;
 
 import java.util.List;
 
-import com.uas.report.controller.schedule.model.TaskInformation;
+import com.uas.report.schedule.model.TaskInformation;
 
 /**
  * 管理定时任务

+ 0 - 0
src/main/java/com/uas/report/controller/schedule/service/impl/TaskServiceImpl.java → src/main/java/com/uas/report/schedule/service/impl/TaskServiceImpl.java


+ 1 - 1
src/main/java/com/uas/report/service/FileService.java

@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.multipart.MultipartFile;
 
-import com.uas.report.controller.schedule.model.DailyTaskInformation;
+import com.uas.report.schedule.model.DailyTaskInformation;
 
 /**
  * 文件操作

+ 3 - 3
src/main/java/com/uas/report/service/impl/FileServiceImpl.java

@@ -33,10 +33,10 @@ import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfCopy;
 import com.lowagie.text.pdf.PdfReader;
-import com.uas.report.controller.schedule.model.DailyTaskInformation;
-import com.uas.report.controller.schedule.model.Executable;
-import com.uas.report.controller.schedule.service.TaskService;
 import com.uas.report.core.exception.ReportException;
+import com.uas.report.schedule.model.DailyTaskInformation;
+import com.uas.report.schedule.service.Executable;
+import com.uas.report.schedule.service.TaskService;
 import com.uas.report.service.FileService;
 import com.uas.report.support.SysConf;
 import com.uas.report.util.FileUtils;

+ 1 - 1
src/main/java/com/uas/report/support/StartupProcessor.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
-import com.uas.report.controller.schedule.service.TaskService;
+import com.uas.report.schedule.service.TaskService;
 import com.uas.report.service.FileService;
 
 /**