wangliang 3 éve
szülő
commit
454186cba7

+ 7 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -311,4 +311,11 @@ public class SysController {
     public Result getMenu() {
         return ResultUtil.ok(sysUserRoleService.listByUserId());
     }
+
+    @ApiOperation(value = "获取服务器时间")
+    @RequestMapping(value = "/get_system_time", method = RequestMethod.POST)
+    @Aac(auth = BOOL.FALSE)
+    public Result getSystemTime() {
+        return ResultUtil.ok(System.currentTimeMillis());
+    }
 }

+ 4 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/TBTaskController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
-import com.qmth.distributed.print.interceptor.AuthInterceptor;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.bean.result.TaskListResult;
@@ -18,11 +17,13 @@ import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.service.TBTaskService;
-import com.qmth.teachcloud.common.util.*;
+import com.qmth.teachcloud.common.util.RedisUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * <p>

+ 1 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TBTask.java

@@ -29,7 +29,7 @@ public class TBTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "任务类型,QUESTION_MISSION_BATCH_CREATE:批量新建命题任务,SAMPLE_EXPORT:导出审核样本,EXAMINATION_IMPORT:考务数据导入,EXAMINATION_EXPORT:考务数据导出,PRINT_PDF_DOWNLOAD:批量下载pdf,CREATE_PDF:生成pdf")
+    @ApiModelProperty(value = "任务类型,USER_IMPORT:用户导入, QUESTION_MISSION_BATCH_CREATE:批量新建命题任务, SAMPLE_EXPORT:导出审核样本, PAPER_DOWNLOAD:卷库下载, EXAMINATION_IMPORT:考务数据导入, EXAMINATION_EXPORT:考务数据导出, PRINT_PDF_DOWNLOAD:批量下载pdf, CREATE_PDF:生成pdf, COURSE_IMPORT:课程导入")
     @TableField(value = "type")
     private TaskTypeEnum type;
 

+ 4 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/TaskTypeEnum.java

@@ -11,6 +11,10 @@ import java.util.Objects;
  */
 public enum TaskTypeEnum {
 
+    USER_IMPORT("用户导入"),
+
+    COURSE_IMPORT("课程导入"),
+
     QUESTION_MISSION_BATCH_CREATE("批量新建命题任务"),
 
     SAMPLE_EXPORT("导出审核样本"),