From 83114a4712567c2701d6d3b9a9d13f290a7cb80f Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Wed, 26 Oct 2022 23:06:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md index bb836763..166b328b 100644 --- a/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md +++ b/web/src/main/resources/sql/jlw/studentHandsOnTaskReport.md @@ -373,4 +373,4 @@ getReportList * 根据开课ID进行查询 select t.* -from student_hands_on_task_report t where t.teacherOpenCourseId in (#join(collect)#) +from student_hands_on_task_report t where t.teacher_open_course_id in (#join(collect)#) From b8d4da18705251addd32a0db8febeaab951df5b2 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Wed, 26 Oct 2022 23:22:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/FunctionConsoleService.java | 9 +++- .../core/service/CorePlatformService.java | 4 ++ .../ibeetl/jlw/entity/SchoolAdminIndex.java | 22 ++++++++ .../entity/StudentHandsOnTaskReportParam.java | 33 ++++++++++++ .../StudentHandsOnTaskReportParams.java | 50 +++++++++++++++++++ .../api/teacher/ApiTeacherService.java | 1 + .../web/StatisticalAnalysisController.java | 4 ++ 7 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/SchoolAdminIndex.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParam.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParams.java diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java index 42bf3388..bf69a677 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java @@ -13,6 +13,7 @@ import com.ibeetl.admin.core.rbac.tree.FunctionItem; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.util.PlatformException; +import org.apache.commons.collections4.CollectionUtils; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -186,14 +187,15 @@ public class FunctionConsoleService extends CoreBaseService { } - + List list = new ArrayList<>(); for(Long add:adds){ CoreRoleFunction function = new CoreRoleFunction(); function.setCreateTime(new Date()); function.setRoleId(roleId); function.setFunctionId(add); function.setDataAccessType(5);// TODO 暂时都定为5 - this.sqlManager.insert(function); + list.add(function); +// this.sqlManager.insert(function); // CoreMenu menu = queryFunctionMenu(add); // if(menu!=null){ // //同时，需要增加菜单 @@ -203,6 +205,9 @@ public class FunctionConsoleService extends CoreBaseService { // sysRoleMenuDao.insert(roleMenu); // } } + if (CollectionUtils.isNotEmpty(list)) { + this.sqlManager.insertBatch(CoreRoleFunction.class, list); + } //清楚缓存 platformService.clearFunctionCache(); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 467805a6..03137588 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -277,6 +277,10 @@ public class CorePlatformService { return true; } String str = functionCode; + CoreFunction functionByCode = sysFunctionDao.getFunctionByCode(str); + if (functionByCode != null && StringUtils.isNotEmpty(functionByCode.getAccessUrl())) { + return true; + } List list = sysRoleFunctionDao.getRoleFunction(userId, orgId, str); boolean canAccess = !list.isEmpty(); if (canAccess) { diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolAdminIndex.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolAdminIndex.java new file mode 100644 index 00000000..36e427a6 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/SchoolAdminIndex.java @@ -0,0 +1,22 @@ +package com.ibeetl.jlw.entity; + +/** + * 类功能说明 + * + * @Version 0.0.1 + * @Author 许良彤 + * @Date 2022/10/26 21:57 + */ +public class SchoolAdminIndex { + + //注册学生数 + + //注册老师数 + + //登录人数 + + //登录人次 + + + +} \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParam.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParam.java new file mode 100644 index 00000000..87ec350e --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParam.java @@ -0,0 +1,33 @@ +package com.ibeetl.jlw.entity; + +import java.util.List; + +/** + * 类功能说明 + * + * @Version 0.0.1 + * @Author 许良彤 + * @Date 2022/10/26 22:11 + */ +public class StudentHandsOnTaskReportParam { + + private Long count; + + private List params; + + public Long getCount() { + return count; + } + + public void setCount(Long count) { + this.count = count; + } + + public List getParams() { + return params; + } + + public void setParams(List params) { + this.params = params; + } +} \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParams.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParams.java new file mode 100644 index 00000000..08f6b16c --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReportParams.java @@ -0,0 +1,50 @@ +package com.ibeetl.jlw.entity; + +/** + * 类功能说明 + * + * @Version 0.0.1 + * @Author 许良彤 + * @Date 2022/10/26 22:12 + */ +public class StudentHandsOnTaskReportParams { + + /** + * 课程名称 + */ + private String courseName; + + /** + * 班级 + */ + private String className; + + /** + * 待审阅份数 + */ + private Long toBeReviewed; + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public Long getToBeReviewed() { + return toBeReviewed; + } + + public void setToBeReviewed(Long toBeReviewed) { + this.toBeReviewed = toBeReviewed; + } +} \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java index 390a308d..16f4304e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java @@ -74,6 +74,7 @@ public class ApiTeacherService { List collect = openCourseList.stream().map(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseId).collect(Collectors.toList()); List reportList = studentHandsOnTaskReportService.getReportList(collect); + return TeacherIndexData.builder() .toDoList(reportList) .noticeList(noticeList) diff --git a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java index 7c556229..ace26ad3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java @@ -48,4 +48,8 @@ public class StatisticalAnalysisController { return JsonResult.success(detail); } + /** + * 管理员端查询 + */ + } \ No newline at end of file