Pārlūkot izejas kodu

增加report基础模块

wangliang 4 gadi atpakaļ
vecāks
revīzija
b43e9a358a

+ 4 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/RoleTypeEnum.java

@@ -17,7 +17,10 @@ public enum RoleTypeEnum {
     QUESTION_TEACHER("命题老师"),
     CUSTOMER("客服员"),
     PRINTER("印刷员"),
-    CUSTOM("自定义");
+    CUSTOM("自定义"),
+    OFFICE_TEACHER("教务处老师"),
+    PRESIDENT("学院院长"),
+    TEACHER("任课老师");
 
     RoleTypeEnum(String desc) {
         this.desc = desc;

+ 10 - 5
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ServletUtil.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
+import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
@@ -148,18 +149,22 @@ public class ServletUtil {
 
     /**
      * 获取header中schoolId
+     *
      * @return
      */
     public static Object getRequestHeaderSchoolId() {
-        Object object = getRequest().getHeader(SystemConstant.SCHOOL_ID);
-        if (Objects.isNull(object)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
-        return object;
+        BasicSchool basicSchool = (BasicSchool) getRequestSchool();
+        return basicSchool.getId();
+//        Object object = getRequest().getHeader(SystemConstant.SCHOOL_ID);
+//        if (Objects.isNull(object)) {
+//            throw ExceptionResultEnum.NOT_LOGIN.exception();
+//        }
+//        return object;
     }
 
     /**
      * 获取header中schoolId
+     *
      * @return
      */
     public static Object getRequestHeaderSchoolIdByNotVaild() {

+ 1 - 1
teachcloud-report/src/main/resources/application.properties

@@ -68,7 +68,7 @@ org.center.orgQueryApi=/api/open/org/query
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
-com.qmth.api.global-auth=true
+com.qmth.api.global-auth=false
 #com.qmth.api.global-strict=false
 #com.qmth.api.global-rate-limit=1/5s