Browse Source

帮助视频

xiatian 7 months ago
parent
commit
dc02f6f701

+ 30 - 14
install/mysql/init/stmms_ft.sql

@@ -1312,40 +1312,50 @@ CREATE TABLE `b_role_privilege`
   DEFAULT CHARSET = utf8mb4 COMMENT ='角色权限关联表';
   DEFAULT CHARSET = utf8mb4 COMMENT ='角色权限关联表';
 
 
 LOCK TABLES `b_privilege` WRITE;
 LOCK TABLES `b_privilege` WRITE;
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('overview', '主页导览', 'root_code', 'MENU', '/admin/basic/overview', 5, 1, 'icon-bookmark', 'index.overview');
 VALUES ('overview', '主页导览', 'root_code', 'MENU', '/admin/basic/overview', 5, 1, 'icon-bookmark', 'index.overview');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('user_list', '用户管理', 'root_code', 'MENU', '/admin/user/list', 10, 1, 'icon-user', 'index.user');
 VALUES ('user_list', '用户管理', 'root_code', 'MENU', '/admin/user/list', 10, 1, 'icon-user', 'index.user');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('user_list-help_video', '帮助视频', 'user_list', 'BUTTON', 2, 1);   
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)                        
 VALUES ('exam_list', '考试管理', 'root_code', 'MENU', '/admin/exam/list', 20, 1, 'icon-th-list', 'index.exam');
 VALUES ('exam_list', '考试管理', 'root_code', 'MENU', '/admin/exam/list', 20, 1, 'icon-th-list', 'index.exam');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('exam_student', '考生管理', 'root_code', 'MENU', '/admin/exam/student', 30, 1, 'icon-user', 'index.student');
 VALUES ('exam_student', '考生管理', 'root_code', 'MENU', '/admin/exam/student', 30, 1, 'icon-user', 'index.student');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('exam_scan', '扫描进度', 'root_code', 'MENU', '/admin/exam/scan', 40, 1, 'icon-print', 'index.scan');
 VALUES ('exam_scan', '扫描进度', 'root_code', 'MENU', '/admin/exam/scan', 40, 1, 'icon-print', 'index.scan');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('exam_paper', '科目管理', 'root_code', 'MENU', '/admin/exam/paper', 50, 1, 'icon-book', 'index.paper');
 VALUES ('exam_paper', '科目管理', 'root_code', 'MENU', '/admin/exam/paper', 50, 1, 'icon-book', 'index.paper');
-INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,
-                           `i18n`)
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`, `level`, `icon`,                           `i18n`)
 VALUES ('exam_mark', '评卷管理', 'root_code', 'MENU', '/admin/basic/role/info/sub/page', 60, 1, 'icon-pencil',
 VALUES ('exam_mark', '评卷管理', 'root_code', 'MENU', '/admin/basic/role/info/sub/page', 60, 1, 'icon-pencil',
         'index.mark');
         'index.mark');
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_mark-mark', '评卷进度', 'exam_mark', 'PAGE', '/admin/exam/mark', 2, 1);
 VALUES ('exam_mark-mark', '评卷进度', 'exam_mark', 'PAGE', '/admin/exam/mark', 2, 1);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_mark-group', '分组管理', 'exam_mark', 'PAGE', '/admin/exam/group', 2, 2);
 VALUES ('exam_mark-group', '分组管理', 'exam_mark', 'PAGE', '/admin/exam/group', 2, 2);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 VALUES ('exam_mark-group-add', '新增', 'exam_mark-group', 'BUTTON', 3, 1);
 VALUES ('exam_mark-group-add', '新增', 'exam_mark-group', 'BUTTON', 3, 1);
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 VALUES ('exam_mark-group-edit', '修改', 'exam_mark-group', 'BUTTON', 3, 2);
 VALUES ('exam_mark-group-edit', '修改', 'exam_mark-group', 'BUTTON', 3, 2);
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 VALUES ('exam_mark-group-reset_edit', '重置修改', 'exam_mark-group', 'BUTTON', 3, 3);
 VALUES ('exam_mark-group-reset_edit', '重置修改', 'exam_mark-group', 'BUTTON', 3, 3);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 VALUES ('exam_mark-group-delete', '删除', 'exam_mark-group', 'BUTTON', 3, 4);
 VALUES ('exam_mark-group-delete', '删除', 'exam_mark-group', 'BUTTON', 3, 4);
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('exam_mark-group-help_video', '帮助视频', 'exam_mark-group', 'BUTTON', 3, 5);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_mark-marker', '评卷员管理', 'exam_mark', 'PAGE', '/admin/exam/marker', 2, 3);
 VALUES ('exam_mark-marker', '评卷员管理', 'exam_mark', 'PAGE', '/admin/exam/marker', 2, 3);
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
@@ -1384,10 +1394,16 @@ VALUES ('exam_inspected_info', '成绩复核', 'root_code', 'MENU', '/admin/basi
         'index.inspected');
         'index.inspected');
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_inspected_info-info', '成绩复核进度', 'exam_inspected_info', 'PAGE', '/admin/exam/inspected/info', 2, 1);
 VALUES ('exam_inspected_info-info', '成绩复核进度', 'exam_inspected_info', 'PAGE', '/admin/exam/inspected/info', 2, 1);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_inspected_info-list', '全卷复核', 'exam_inspected_info', 'PAGE', '/admin/exam/inspected/list', 2, 2);
 VALUES ('exam_inspected_info-list', '全卷复核', 'exam_inspected_info', 'PAGE', '/admin/exam/inspected/list', 2, 2);
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
 VALUES ('exam_inspected_info-next_round', '再次复核', 'exam_inspected_info-list', 'BUTTON', 3, 1);
 VALUES ('exam_inspected_info-next_round', '再次复核', 'exam_inspected_info-list', 'BUTTON', 3, 1);
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('exam_inspected_info-list-help_video', '帮助视频', 'exam_inspected_info-list', 'BUTTON', 3, 2);   
+
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `level`, `seq`)
 VALUES ('exam_inspected_info-score_verify', '成绩校验', 'exam_inspected_info', 'PAGE', '/admin/exam/score/verify/init', 2,
 VALUES ('exam_inspected_info-score_verify', '成绩校验', 'exam_inspected_info', 'PAGE', '/admin/exam/score/verify/init', 2,
         3);
         3);

+ 19 - 3
install/mysql/upgrade/1.5.1.sql

@@ -43,6 +43,15 @@ VALUES ('exam_report_subject-subjective_question', '主观题分析', 'exam_repo
 INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-group', '大题分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectGroup', 80,2);
 VALUES ('exam_report_subject-group', '大题分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectGroup', 80,2);
 
 
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('user_list-help_video', '帮助视频', 'user_list', 'BUTTON', 2, 1);
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('exam_mark-group-help_video', '帮助视频', 'exam_mark-group', 'BUTTON', 3, 5);
+
+INSERT INTO `b_privilege` (`code`, `name`, `parent_code`, `privilege_type`, `level`, `seq`)
+VALUES ('exam_inspected_info-list-help_video', '帮助视频', 'exam_inspected_info-list', 'BUTTON', 3, 2); 
+
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('overview','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 where p.`code` in('overview','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
@@ -53,13 +62,15 @@ INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code
 SELECT s.id,'SUBJECT_HEADER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'SUBJECT_HEADER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 where p.`code` in('exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 'exam_report_subject-teacher','exam_report_subject-class'
 'exam_report_subject-teacher','exam_report_subject-class'
-,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group');
+,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group'
+,'exam_mark-group-help_video','exam_inspected_info-list-help_video');
 
 
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 SELECT s.id,'COLLEGE_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'COLLEGE_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 where p.`code` in('exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 'exam_report_subject-teacher','exam_report_subject-class'
 'exam_report_subject-teacher','exam_report_subject-class'
-,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group');
+,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group',
+'exam_mark-group-help_video','exam_inspected_info-list-help_video');
 
 
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 SELECT s.id,'SCHOOL_VIEWER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'SCHOOL_VIEWER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
@@ -67,7 +78,8 @@ where p.`code` in('exam_report_subject','exam_report_subject-total');
 
 
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
-where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
+where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit'
+,'exam_mark-group-delete','user_list-help_video','exam_mark-group-help_video','exam_inspected_info-list-help_video');
 
 
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
 SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
@@ -77,6 +89,10 @@ INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code
 SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
 SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
 where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
 
 
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'INSPECTOR',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
+where p.`code` in('exam_inspected_info-list-help_video');
+
 
 
 USE college_scan_multi;
 USE college_scan_multi;
 
 

+ 6 - 4
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/basic/service/impl/PrivilegeServiceImpl.java

@@ -99,7 +99,8 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         sql.append(
         sql.append(
                 " ,'exam_score','exam_score-export','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',"
                 " ,'exam_score','exam_score-export','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',"
                         + "'exam_report_subject-teacher','exam_report_subject-class'"
                         + "'exam_report_subject-teacher','exam_report_subject-class'"
-                        + ",'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group')");
+                        + ",'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group'"
+                        + ",'exam_mark-group-help_video','exam_inspected_info-list-help_video')");
         sql.append(" and s.id=" + schoolId);
         sql.append(" and s.id=" + schoolId);
         Query query = entityManager.createNativeQuery(sql.toString());
         Query query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();
         query.executeUpdate();
@@ -130,7 +131,8 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         sql.append(
         sql.append(
                 " ,'exam_score','exam_score-export','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',"
                 " ,'exam_score','exam_score-export','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',"
                         + "'exam_report_subject-teacher','exam_report_subject-class'"
                         + "'exam_report_subject-teacher','exam_report_subject-class'"
-                        + ",'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group')");
+                        + ",'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group'"
+                        + ",'exam_mark-group-help_video','exam_inspected_info-list-help_video')");
         sql.append(" and s.id=" + schoolId);
         sql.append(" and s.id=" + schoolId);
         Query query = entityManager.createNativeQuery(sql.toString());
         Query query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();
         query.executeUpdate();
@@ -149,8 +151,8 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         StringBuilder sql = new StringBuilder();
         StringBuilder sql = new StringBuilder();
         sql.append(" INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
         sql.append(" INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
         sql.append(" SELECT s.id,'INSPECTOR',p.`code`,1 from b_privilege p join b_school s   ");
         sql.append(" SELECT s.id,'INSPECTOR',p.`code`,1 from b_privilege p join b_school s   ");
-        sql.append(
-                " where p.`code` in('exam_inspected_info','exam_inspected_info-info','exam_inspected_info-list','exam_inspected_info-next_round')");
+        sql.append(" where p.`code` in('exam_inspected_info','exam_inspected_info-info','exam_inspected_info-list'"
+                + ",'exam_inspected_info-list-help_video','exam_inspected_info-next_round')");
         sql.append(" and s.id=" + schoolId);
         sql.append(" and s.id=" + schoolId);
         Query query = entityManager.createNativeQuery(sql.toString());
         Query query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();
         query.executeUpdate();

+ 3 - 3
stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/Role.java

@@ -2,9 +2,9 @@ package cn.com.qmth.stmms.common.enums;
 
 
 public enum Role {
 public enum Role {
 
 
-    SYS_ADMIN("系统管理员", 1), SCHOOL_ADMIN("学校管理员", 2), SCANNER("扫描员", 3), SUBJECT_HEADER("科组长", 4), MARKER("评卷员", 5), SCHOOL_VIEWER(
-            "学校查询员", 6), SCHOOL_DEV("学校接口调用", 7), INSPECTOR("复核员", 8), SCAN_ADMIN("扫描管理员", 9), COLLEGE_ADMIN("学院管理员",
-            10);
+    SYS_ADMIN("系统管理员", 1), SCHOOL_ADMIN("学校管理员", 2), SCANNER("扫描员", 3), SUBJECT_HEADER("科组长", 4), MARKER("评卷员",
+            5), SCHOOL_VIEWER("学校查询员", 6), SCHOOL_DEV("学校接口调用",
+                    7), INSPECTOR("复核员", 8), SCAN_ADMIN("扫描管理员", 9), COLLEGE_ADMIN("学院管理员", 10);
 
 
     private String name;
     private String name;
 
 

+ 60 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/basic/BasicController.java

@@ -0,0 +1,60 @@
+package cn.com.qmth.stmms.admin.basic;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import cn.com.qmth.stmms.admin.exam.BaseExamController;
+import cn.com.qmth.stmms.biz.exam.service.CheckStudentService;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.common.enums.CheckType;
+
+@Controller
+@RequestMapping("/admin/basic")
+public class BasicController extends BaseExamController {
+
+    @Autowired
+    private ExamStudentService examStudentService;
+
+    @Autowired
+    private ExamSubjectService examSubjectService;
+
+    @Autowired
+    private CheckStudentService checkStudentService;
+
+    @RequestMapping("overview")
+    public String roleLise(Model model, HttpServletRequest request) {
+        int examId = getSessionExamId(request);
+        long studentCount = examStudentService.countByExamId(examId);
+        model.addAttribute("studentCount", studentCount);
+        model.addAttribute("subjectCount", examSubjectService.count(examId));
+        if (studentCount > 0
+                && checkStudentService.countByExamIdAndCheckedAndType(examId, false, CheckType.MANUAL) == 0) {
+            model.addAttribute("checkStudentOk", true);
+        } else {
+            model.addAttribute("checkStudentOk", false);
+        }
+        model.addAttribute("checkSubjectOk", studentCount > 0 && examSubjectService.checkSubjectForExport(examId));
+        model.addAttribute("checkAbsentOk", studentCount > 0 && examSubjectService.checkSubjectAbsentForExport(examId));
+        return "modules/basic/overview";
+    }
+
+    @RequestMapping("video")
+    public String video(Model model, HttpServletRequest request, String type) {
+        if ("group-edit".equals(type)) {
+            model.addAttribute("videoTitle", "分组修改");
+            model.addAttribute("videoUrl", "/video/group-edit.mp4");
+        } else if ("marker-batch-create".equals(type)) {
+            model.addAttribute("videoTitle", "批量创建评卷员导出");
+            model.addAttribute("videoUrl", "/video/marker-batch-create.mp4");
+        } else if ("inspect-reject".equals(type)) {
+            model.addAttribute("videoTitle", "全卷复核打回");
+            model.addAttribute("videoUrl", "/video/inspect-reject.mp4");
+        }
+        return "modules/basic/video";
+    }
+}

+ 0 - 44
stmms-web/src/main/java/cn/com/qmth/stmms/admin/basic/OverviewController.java

@@ -1,44 +0,0 @@
-package cn.com.qmth.stmms.admin.basic;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import cn.com.qmth.stmms.admin.exam.BaseExamController;
-import cn.com.qmth.stmms.biz.exam.service.CheckStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
-import cn.com.qmth.stmms.common.enums.CheckType;
-
-@Controller
-@RequestMapping("/admin/basic/overview")
-public class OverviewController extends BaseExamController {
-	@Autowired
-	private ExamStudentService examStudentService;
-	
-	@Autowired
-	private ExamSubjectService examSubjectService;
-	
-	@Autowired
-	private CheckStudentService checkStudentService;
-
-	@RequestMapping
-	public String roleLise(Model model, HttpServletRequest request) {
-		int examId = getSessionExamId(request);
-		long studentCount=examStudentService.countByExamId(examId);
-		model.addAttribute("studentCount", studentCount);
-		model.addAttribute("subjectCount", examSubjectService.count(examId));
-		if(studentCount>0&&checkStudentService.countByExamIdAndCheckedAndType(examId, false, CheckType.MANUAL)==0) {
-			model.addAttribute("checkStudentOk", true);
-		}else {
-			model.addAttribute("checkStudentOk", false);
-		}
-		model.addAttribute("checkSubjectOk", studentCount>0&&examSubjectService.checkSubjectForExport(examId));
-		model.addAttribute("checkAbsentOk", studentCount>0&&examSubjectService.checkSubjectAbsentForExport(examId));
-		return "modules/basic/overview";
-	}
-	
-}

+ 24 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/basic/video.jsp

@@ -0,0 +1,24 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>${videoTitle}</title>
+    <meta name="decorator" content="default"/>
+    <%@include file="/WEB-INF/views/include/head.jsp" %>
+    <%@include file="/WEB-INF/views/include/dialog.jsp" %>
+    <style type="text/css">
+    .vd {
+		height: 100vh;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%,-50%);
+	}
+    </style>
+</head>
+<body>
+   <video class="vd" autoplay="autoplay"  controls="controls">
+		<source src="${ctxStatic}${videoUrl}" type="audio/mp4">
+	</video>
+  </body>
+</html>

+ 8 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupList.jsp

@@ -53,6 +53,11 @@
             <input id="btnFinish" class="btn" type="button" value="关闭" onclick="goFinish()"/>
             <input id="btnFinish" class="btn" type="button" value="关闭" onclick="goFinish()"/>
             <a href="javascript:void(0)" class="trial-button"
             <a href="javascript:void(0)" class="trial-button"
                        onclick="updateTrialCount();">设置试评数量</a>
                        onclick="updateTrialCount();">设置试评数量</a>
+            <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group-help_video')}">           
+            <a href="${ctx}/admin/basic/video?type=group-edit" style="float:right;" target="_blank">        
+            	<img  src="${ctxStatic}/video/help.svg" style="width:28px;height:28px;">
+            </a>
+            </c:if>
     </div>
     </div>
 </form>
 </form>
 <tags:message content="${message}"/>
 <tags:message content="${message}"/>
@@ -156,6 +161,9 @@
 </div>
 </div>
 </form>
 </form>
 <script type="text/javascript">
 <script type="text/javascript">
+	function openVideo(){
+		window.open("${ctx}/admin/exam/basic?type=group-edit");
+	}
     function page(n, s) {
     function page(n, s) {
         $("#pageNumber").val(n);
         $("#pageNumber").val(n);
         $("#pageSize").val(s);
         $("#pageSize").val(s);

+ 5 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/inspectedList.jsp

@@ -135,6 +135,11 @@
                     <li><a href="##" id="workBtnExport">工作量</a></li>
                     <li><a href="##" id="workBtnExport">工作量</a></li>
                 </ul>
                 </ul>
                 </div>
                 </div>
+                <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_inspected_info-list-help_video')}">  
+                        <a href="${ctx}/admin/basic/video?type=inspect-reject" style="float:right;" target="_blank">        
+            	<img  src="${ctxStatic}/video/help.svg" style="width:28px;height:28px;">
+            </a>
+            </c:if>
     </div>
     </div>
 </form>
 </form>
 <tags:message content="${message}"/>
 <tags:message content="${message}"/>

+ 5 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -113,6 +113,11 @@
             &nbsp;
             &nbsp;
             <input id="btnReset" class="btn" type="button" value="重置密码" onclick="goReset()"/>
             <input id="btnReset" class="btn" type="button" value="重置密码" onclick="goReset()"/>
         </c:if>
         </c:if>
+        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'user_list-help_video')}">
+        <a href="${ctx}/admin/basic/video?type=marker-batch-create" style="float:right;" target="_blank">        
+            	<img  src="${ctxStatic}/video/help.svg" style="width:28px;height:28px;">
+            </a>
+            </c:if>
     </div>
     </div>
 </form>
 </form>
 <form id="exportForm" action="${ctx}/admin/user/export" method="post" class="breadcrumb form-search hide">
 <form id="exportForm" action="${ctx}/admin/user/export" method="post" class="breadcrumb form-search hide">

BIN
stmms-web/src/main/webapp/static/video/group-edit.mp4


+ 1 - 0
stmms-web/src/main/webapp/static/video/help.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 56 56"><path fill="#0088cc" d="M28 51.906c13.055 0 23.906-10.828 23.906-23.906c0-13.055-10.875-23.906-23.93-23.906C14.899 4.094 4.095 14.945 4.095 28c0 13.078 10.828 23.906 23.906 23.906m0-3.984C16.937 47.922 8.1 39.062 8.1 28c0-11.04 8.813-19.922 19.876-19.922c11.039 0 19.921 8.883 19.945 19.922c.023 11.063-8.883 19.922-19.922 19.922m-.492-15.07c1.172 0 1.898-.727 1.898-1.664v-.282c0-1.312.75-2.133 2.39-3.21c2.274-1.5 3.891-2.884 3.891-5.673c0-3.914-3.468-6-7.453-6c-4.031 0-6.68 1.899-7.312 4.055c-.117.399-.211.774-.211 1.172c0 1.031.844 1.617 1.617 1.617c1.336 0 1.547-.726 2.297-1.594c.773-1.289 1.898-2.062 3.469-2.062c2.133 0 3.515 1.195 3.515 3c0 1.594-.984 2.367-3.023 3.773c-1.688 1.172-2.953 2.414-2.953 4.711V31c0 1.242.68 1.852 1.875 1.852m-.047 7.007c1.36 0 2.531-1.078 2.531-2.437c0-1.383-1.148-2.438-2.531-2.438s-2.531 1.078-2.531 2.438c0 1.336 1.171 2.437 2.53 2.437"/></svg>

BIN
stmms-web/src/main/webapp/static/video/inspect-reject.mp4


BIN
stmms-web/src/main/webapp/static/video/marker-batch-create.mp4