From 436088db019af0dad4d62abccef7f1a5ffa3cb74 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 20 Sep 2023 10:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C=E8=AF=BE=E7=A8=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0enabled=20,=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/api/CourseFileApi.java | 13 +++++++++++-- .../com/xboe/module/course/api/CourseManageApi.java | 12 ++++++------ .../com/xboe/module/course/dto/CourseQueryDto.java | 5 +++++ .../course/service/impl/CourseFileServiceImpl.java | 2 ++ .../course/service/impl/CourseServiceImpl.java | 5 ++++- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java index c644a653..9b6b6331 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java @@ -128,8 +128,13 @@ public class CourseFileApi extends ApiBaseController { //默认是查询自己的课件。 // - PageList courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters); - return success(courseFilePageList); + try { + PageList courseFilePageList = courseFileService.queryPage(pager.getPageIndex(), pager.getPageSize(), OrderCondition.desc("id"), filters); + return success(courseFilePageList); + }catch(Exception e) { + log.error("查询课件错误",e); + return error("查询失败",e.getMessage()); + } } /** @@ -217,6 +222,10 @@ public class CourseFileApi extends ApiBaseController { if (StringUtils.isBlank(file.getFilePath())) { return badRequest("无文件信息"); } + + if(StringUtils.isBlank(file.getOrgId())) { + return badRequest("请先选择资源归属"); + } // 重设文件类型为小写 file.setFileType(file.getFileType().toLowerCase()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 5740b5ec..57f0081a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -106,12 +106,12 @@ public class CourseManageApi extends ApiBaseController{ IDataUserSyncService userSyncService; - @PostMapping("/test") - public JsonResponse> findTest(Pagination pager,CourseQueryDto dto){ - //dto.setOrgAid("7003708665807110150"); - PageList coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto); - return success(coursePageList); - } +// @PostMapping("/test") +// public JsonResponse> findTest(Pagination pager,CourseQueryDto dto){ +// //dto.setOrgAid("7003708665807110150"); +// PageList coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto); +// return success(coursePageList); +// } /** * 管理列表的查询 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java index bfb5b470..43b9b68c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java @@ -31,6 +31,11 @@ public class CourseQueryDto { /**是否发布，无就是全部*/ private Boolean publish; + /** + * 是否启用 + */ + private Boolean enabled; + /**创建人*/ private String createUser; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java index 37e2ce19..c9b003d0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java @@ -72,6 +72,8 @@ public class CourseFileServiceImpl implements ICourseFileService { public void updateList(List cflist) { for(CourseFile cf : cflist) { courseFileDao.updateMultiFieldById(cf.getId(), UpdateBuilder.create("name",cf.getName()), + UpdateBuilder.create("orgId",cf.getOrgId()), + UpdateBuilder.create("orgName",cf.getOrgName()), UpdateBuilder.create("resOwner1",cf.getResOwner1()), UpdateBuilder.create("resOwner2",cf.getResOwner2()), UpdateBuilder.create("resOwner3",cf.getResOwner3()), diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 255faf00..d8ee2adb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -216,7 +216,10 @@ public class CourseServiceImpl implements ICourseService { if(dto.getPublish()!=null){ filters.add(FieldFilters.eq("published",dto.getPublish())); } - + //是否启用 + if(dto.getEnabled()!=null){ + filters.add(FieldFilters.eq("enabled",dto.getEnabled())); + } return filters; }