Merge branch 'dev_v2.2.1' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.1

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysUser.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.userPush.SyncStatusEnum;
 import com.qmth.teachcloud.common.service.SysConfigService;
 import com.qmth.teachcloud.common.util.Base64Util;
 import io.swagger.annotations.ApiModelProperty;
@@ -109,7 +110,7 @@ public class SysUser extends BaseEntity implements Serializable {
     private Long[] courseIds;
 
     @ApiModelProperty(value = "同步状态")
-    private Integer syncStatus;
+    private SyncStatusEnum syncStatus;
 
     @Override
     public void insertInfo(Long userId) {
@@ -123,11 +124,11 @@ public class SysUser extends BaseEntity implements Serializable {
         return serialVersionUID;
     }
 
-    public Integer getSyncStatus() {
+    public SyncStatusEnum getSyncStatus() {
         return syncStatus;
     }
 
-    public void setSyncStatus(Integer syncStatus) {
+    public void setSyncStatus(SyncStatusEnum syncStatus) {
         this.syncStatus = syncStatus;
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/SpecialPrivilegeEnum.java

@@ -0,0 +1,35 @@
+package com.qmth.teachcloud.common.enums.userPush;
+
+/**
+ * @Description: 用户特殊身份(权限)枚举
+ * @Author: CaoZixuan
+ * @Date: 2021-10-27
+ */
+public enum SpecialPrivilegeEnum {
+    MARKER("评卷员权限","Marker","M_"),
+    SUBJECT_HEADER("科组长权限","SubjectHeader","S_"),
+    COMPOSITE("复合权限","Composite",null),
+    ;
+
+    SpecialPrivilegeEnum(String title, String id, String prefix) {
+        this.title = title;
+        this.id = id;
+        this.prefix = prefix;
+    }
+
+    private final String title;
+    private final String id;
+    private final String prefix;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/userPush/SyncStatusEnum.java

@@ -0,0 +1,19 @@
+package com.qmth.teachcloud.common.enums.userPush;
+
+/**
+ * @Description: 用户同步云阅卷同步状态枚举类
+ * @Author: CaoZixuan
+ * @Date: 2021-10-27
+ */
+public enum SyncStatusEnum {
+    NEED_PUSH_AGAIN("需要重新推送"),
+    ;
+    SyncStatusEnum(String desc) {
+        this.desc = desc;
+    }
+    private final String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+}