From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
index e74e798..b24c4f6 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
@@ -43,7 +43,7 @@
doc.setHandoutId(handoutId);
doc.setStatus(ResItemDoc.STATUS_LINEUP);
save(doc);
- // 将文档id放进缓存
+ // 灏嗘枃妗d鏀捐繘缂撳瓨
cacheService.lstRightPush(RES_DOC_CONVER_LST, handoutId);
return doc.getDocId();
}
@@ -79,6 +79,7 @@
HandoutConverTask task = new HandoutConverTask();
task.setCreateTime(new Date());
+ task.setUpdateTime(new Date());
task.setHandoutId(handout.getHandoutId());
task.setHandoutUrl(handout.getFullPath());
task.setStatus(HandoutConverTask.STATUS_DRAFT);
@@ -94,7 +95,7 @@
ResItemDoc doc = read(ResItemDoc.class, id);
- TraceUtils.setUpdateTrace(doc);
+// TraceUtils.setUpdateTrace(doc);
doc.setName(name);
@@ -107,7 +108,9 @@
public String readAccessPath(String resId, String attribute) {
ResItemDoc resItemDoc = read(ResItemDoc.class, resId);
if (ResItemDoc.STATUS_DRAFT != resItemDoc.getStatus()) {
- return null;
+ ResFile resFile = read(ResFile.class,resItemDoc.getOrigFileId());
+ return resFile.getPath();
+// return null;
}
SchHandout schHandout = read(SchHandout.class, resItemDoc.getHandoutId());
@@ -123,7 +126,7 @@
return Res.FILE_TYPE_DOC;
}
- @Scheduled(cron = "0/2 * * * * ?") // 每10秒执行一次
+ @Scheduled(cron = "0/2 * * * * ?") // 姣�10绉掓墽琛屼竴娆�
public void doTimer() {
String id = cacheService.lstLeftPop(RES_DOC_CONVER_LST);
--
Gitblit v1.8.0