线上视频帮助不显示

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

@@ -7,6 +7,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,8 +18,11 @@ import cn.com.qmth.stmms.biz.basic.model.Privilege;
 import cn.com.qmth.stmms.biz.basic.model.RoleInfo;
 import cn.com.qmth.stmms.biz.basic.service.PrivilegeService;
 import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.config.model.SystemAuth;
+import cn.com.qmth.stmms.biz.config.service.SystemAuthService;
 import cn.com.qmth.stmms.common.enums.PrivilegeType;
 import cn.com.qmth.stmms.common.enums.Role;
+import cn.com.qmth.stmms.common.enums.SystemAuthType;
 
 @Service("privilegeService")
 public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements PrivilegeService {
@@ -36,6 +40,9 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
     @Autowired
     private RoleInfoDao roleInfoDao;
 
+    @Autowired
+    private SystemAuthService authService;
+
     @Override
     public List<Privilege> getMenuPrivileges() {
         if (privileges == null) {
@@ -71,24 +78,41 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
         initCollegeAdminPrivilege(schoolId);
         initInspectorPrivilege(schoolId);
         initSchoolViewerPrivilege(schoolId);
+
+        SystemAuth systemAuth = authService.findOne();
+        if (SystemAuthType.ONLINE.equals(systemAuth.getType())) {
+            disablePrivilege(schoolId, new String[] { "user_list-help_video", "exam_mark-group-help_video",
+                    "exam_inspected_info-list-help_video" });
+        }
+    }
+
+    private void disablePrivilege(Integer schoolId, String[] codes) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("update b_role_privilege ");
+        sql.append(" set enable=0   ");
+        sql.append(" where privilege_code in('" + StringUtils.join(codes, "','") + "')");
+        sql.append(" and school_id=" + schoolId);
+        Query query = entityManager.createNativeQuery(sql.toString());
+        query.executeUpdate();
     }
 
     private void initSchoolAdminPrivilege(Integer schoolId) {
+        Role role = Role.SCHOOL_ADMIN;
         StringBuilder sql = new StringBuilder();
         sql.append(" INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`) ");
-        sql.append(" SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from b_privilege p join b_school s ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,1 from b_privilege p join b_school s ");
         sql.append(" where s.id=" + schoolId);
         Query query = entityManager.createNativeQuery(sql.toString());
         query.executeUpdate();
     }
 
     private void initSubjectHeaderPrivilege(Integer schoolId) {
+        Role role = Role.SUBJECT_HEADER;
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
-        sql.append(" SELECT s.id,'SUBJECT_HEADER',p.`code`,1 from b_privilege p join b_school s   ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,1 from b_privilege p join b_school s   ");
         sql.append(
                 " where p.`code` in('exam_mark','exam_mark-mark','exam_mark-group','exam_mark-marker','exam_mark-trial','exam_mark-library'");
-        ;
         sql.append(
                 " ,'exam_mark-library-inspect','exam_mark-library-reject','exam_mark-arbitrate','exam_mark-quality','exam_reject_list'");
         sql.append(
@@ -107,7 +131,7 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
 
         sql = new StringBuilder();
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
-        sql.append(" SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from b_privilege p join b_school s   ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,0 from b_privilege p join b_school s   ");
         sql.append(
                 " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete')");
         sql.append(" and s.id=" + schoolId);
@@ -116,9 +140,10 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
     }
 
     private void initCollegeAdminPrivilege(Integer schoolId) {
+        Role role = Role.COLLEGE_ADMIN;
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
-        sql.append(" SELECT s.id,'COLLEGE_ADMIN',p.`code`,1 from b_privilege p join b_school s   ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,1 from b_privilege p join b_school s   ");
         sql.append(
                 " where p.`code` in('exam_mark','exam_mark-mark','exam_mark-group','exam_mark-marker','exam_mark-trial','exam_mark-library'");
         sql.append(
@@ -139,7 +164,7 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
 
         sql = new StringBuilder();
         sql.append("INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
-        sql.append(" SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from b_privilege p join b_school s   ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,0 from b_privilege p join b_school s   ");
         sql.append(
                 " where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete')");
         sql.append(" and s.id=" + schoolId);
@@ -148,9 +173,10 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
     }
 
     private void initInspectorPrivilege(Integer schoolId) {
+        Role role = Role.INSPECTOR;
         StringBuilder sql = new StringBuilder();
         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,'" + role.name() + "',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-list-help_video','exam_inspected_info-next_round')");
         sql.append(" and s.id=" + schoolId);
@@ -159,9 +185,10 @@ public class PrivilegeServiceImpl extends BaseQueryService<Privilege> implements
     }
 
     private void initSchoolViewerPrivilege(Integer schoolId) {
+        Role role = Role.SCHOOL_VIEWER;
         StringBuilder sql = new StringBuilder();
         sql.append(" INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)");
-        sql.append(" SELECT s.id,'SCHOOL_VIEWER',p.`code`,1 from b_privilege p join b_school s   ");
+        sql.append(" SELECT s.id,'" + role.name() + "',p.`code`,1 from b_privilege p join b_school s   ");
         sql.append(
                 " where p.`code` in('exam_score','exam_report_subject','exam_report_subject-total','operation_log')");
         sql.append(" and s.id=" + schoolId);

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

@@ -11,12 +11,16 @@ 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.biz.file.service.FileService;
 import cn.com.qmth.stmms.common.enums.CheckType;
 
 @Controller
 @RequestMapping("/admin/basic")
 public class BasicController extends BaseExamController {
 
+    @Autowired
+    private FileService fileService;
+
     @Autowired
     private ExamStudentService examStudentService;
 
@@ -45,15 +49,20 @@ public class BasicController extends BaseExamController {
 
     @RequestMapping("video")
     public String video(Model model, HttpServletRequest request, String type) {
+        String server = fileService.getFileServer();
+        String spe = "";
+        if (!server.endsWith("/")) {
+            spe = "/";
+        }
         if ("group-edit".equals(type)) {
             model.addAttribute("videoTitle", "分组修改");
-            model.addAttribute("videoUrl", "/video/group-edit.mp4");
+            model.addAttribute("videoUrl", server + spe + "video/group-edit.mp4");
         } else if ("marker-batch-create".equals(type)) {
             model.addAttribute("videoTitle", "批量创建评卷员导出");
-            model.addAttribute("videoUrl", "/video/marker-batch-create.mp4");
+            model.addAttribute("videoUrl", server + spe + "video/marker-batch-create.mp4");
         } else if ("inspect-reject".equals(type)) {
             model.addAttribute("videoTitle", "全卷复核打回");
-            model.addAttribute("videoUrl", "/video/inspect-reject.mp4");
+            model.addAttribute("videoUrl", server + spe + "video/inspect-reject.mp4");
         }
         return "modules/basic/video";
     }

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

@@ -18,7 +18,7 @@
 </head>
 <body>
    <video class="vd" autoplay="autoplay"  controls="controls">
-		<source src="${ctxStatic}${videoUrl}" type="audio/mp4">
+		<source src="${videoUrl}" type="audio/mp4">
 	</video>
   </body>
 </html>