diff --git a/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/resource/ResourceService.java b/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/resource/ResourceService.java index dffc8a2..8399ea4 100644 --- a/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/resource/ResourceService.java +++ b/schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/resource/ResourceService.java @@ -66,7 +66,7 @@ public interface ResourceService { * @param resource 资源信息 * @param userDeptRoles 创建者部门角色列表 */ - ResultDomain createResource(ResourceVO resource, java.util.List userDeptRoles); + ResultDomain createResource(ResourceVO resource, List userDeptRoles); /** * @description 批量创建资源 diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java index 7146473..6932ba3 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java @@ -16,6 +16,7 @@ import org.xyzh.common.dto.crontab.CreateTaskRequest; import org.xyzh.common.dto.crontab.TbCrontabEmailDefault; import org.xyzh.common.dto.crontab.TbCrontabEmailRecipient; import org.xyzh.common.dto.crontab.TbCrontabTask; +import org.xyzh.common.dto.user.TbSysUser; import org.xyzh.common.dto.crontab.TbCrontabLog; import org.xyzh.common.utils.IDUtils; import org.xyzh.common.vo.UserDeptRoleVO; @@ -132,7 +133,8 @@ public class CrontabServiceImpl implements CrontabService { ResultDomain resultDomain = new ResultDomain<>(); try { TbCrontabTask task = request.getTask(); - + TbSysUser user = LoginUtil.getCurrentUser(); + task.setCreator(user.getID()); // 1. 创建任务 ResultDomain createResult = createTask(task); if (!createResult.isSuccess()) { diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java index d36d7ba..105b2ee 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java @@ -528,13 +528,14 @@ public class NewsCrawlerTask extends PythonCommandTask { resource.setAuthor(item.getAuthor()); resource.setSource(item.getSource()); resource.setSourceUrl(item.getSourceUrl()); - resource.setIsAudited(true); + resource.setCreator(task.getCreator()); // 发布时间:优先使用采集表中的时间 Date publishTime = item.getPublishTime() != null ? item.getPublishTime() : now; resource.setPublishTime(publishTime); // 状态:已发布 resource.setStatus(1); + resource.setIsAudited(true); resource.setViewCount(0); resource.setLikeCount(0); resource.setCollectCount(0); diff --git a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml index ec08000..698066d 100644 --- a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml +++ b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml @@ -207,10 +207,10 @@ INSERT INTO tb_resource ( id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited, - source_url, creator,create_time + status,source_url, creator,create_time ) VALUES ( #{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, - #{sourceUrl}, #{creator}, #{createTime} + #{status}, #{sourceUrl}, #{creator}, #{createTime} ) diff --git a/schoolNewsServ/study/pom.xml b/schoolNewsServ/study/pom.xml index a5c45dc..c27b5df 100644 --- a/schoolNewsServ/study/pom.xml +++ b/schoolNewsServ/study/pom.xml @@ -12,9 +12,9 @@ org.xyzh study 1.0.0 - jar study 学习管理模块 + jar 21 @@ -29,7 +29,7 @@ org.xyzh - api-new + api-news 1.0.0