武大考务数据对接-联调bug修改

src/main/java/com/qmth/eds/api/ExamSemesterController.java

@@ -7,10 +7,7 @@ import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.service.ExamSemesterService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
@@ -52,7 +49,7 @@ public class ExamSemesterController {
      */
     @ApiOperation(value = "新增/修改")
     @PostMapping("/save")
-    public Result save(@RequestParam(value = "examSemester", required = false) ExamSemester examSemester) {
+    public Result save(@RequestBody ExamSemester examSemester) {
         return ResultUtil.ok(examSemesterService.saveData(examSemester));
     }
 

src/main/java/com/qmth/eds/api/ExamTypeController.java

@@ -7,10 +7,7 @@ import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.service.ExamTypeService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
@@ -52,7 +49,7 @@ public class ExamTypeController {
      */
     @ApiOperation(value = "新增/修改")
     @PostMapping("/save")
-    public Result save(@RequestParam(value = "examType", required = false) ExamType examType) {
+    public Result save(@RequestBody ExamType examType) {
         return ResultUtil.ok(examTypeService.saveData(examType));
     }
 

src/main/java/com/qmth/eds/service/impl/SysUserServiceImpl.java

@@ -85,6 +85,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserRole sysUserRole = new SysUserRole();
         sysUserRole.setId(SystemConstant.getDbUuid());
         sysUserRole.setUserId(sysUser.getId());
+        sysUserRole.setRoleId(sysUser.getRoleId());
+        sysUserRole.setEnable(true);
         return sysUserRoleService.save(sysUserRole);
     }
 

src/main/java/com/qmth/eds/service/impl/TeachcloudCommonServiceImpl.java

@@ -6,19 +6,20 @@ import com.qmth.eds.bean.auth.ExpireTimeBean;
 import com.qmth.eds.bean.result.LoginResult;
 import com.qmth.eds.bean.result.UserLoginCheckResult;
 import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.BasicSchool;
 import com.qmth.eds.common.entity.SysRole;
 import com.qmth.eds.common.entity.SysUser;
 import com.qmth.eds.common.entity.TBSession;
 import com.qmth.eds.common.enums.AppSourceEnum;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
-import com.qmth.eds.service.CommonCacheService;
-import com.qmth.eds.service.SysRoleService;
-import com.qmth.eds.service.TBSessionService;
-import com.qmth.eds.service.TeachcloudCommonService;
 import com.qmth.eds.common.util.AuthUtil;
 import com.qmth.eds.common.util.RedisUtil;
 import com.qmth.eds.common.util.ServletUtil;
 import com.qmth.eds.common.util.SessionUtil;
+import com.qmth.eds.service.CommonCacheService;
+import com.qmth.eds.service.SysRoleService;
+import com.qmth.eds.service.TBSessionService;
+import com.qmth.eds.service.TeachcloudCommonService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -78,8 +79,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-//        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNames, appSource);
         LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleNames, appSource);
+        BasicSchool basicSchool = commonCacheService.schoolCache(sysUser.getSchoolId());
+        loginResult.setSchoolInfo(Objects.nonNull(basicSchool) ? loginResult.new SchoolNativeBean(basicSchool) : null);
         loginResult.setTime(System.currentTimeMillis());
         String mobileNumber = sysUser.getMobileNumber();
         int pwdCount = sysUser.getPwdCount();

src/main/resources/db/eds-v1.0.0.sql → src/main/resources/db/eds-v1.0.1.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MySQL
  Source Server Version : 50717
  Source Host           : localhost:3306
- Source Schema         : a
+ Source Schema         : eds-v1.0.1
 
  Target Server Type    : MySQL
  Target Server Version : 50717
  File Encoding         : 65001
 
- Date: 23/05/2022 11:08:12
+ Date: 03/11/2022 17:41:36
 */
 
 SET NAMES utf8mb4;
@@ -45,14 +45,18 @@ DROP TABLE IF EXISTS `basic_message`;
 CREATE TABLE `basic_message`  (
   `id` bigint(20) NOT NULL COMMENT '主键',
   `school_id` bigint(20) NULL DEFAULT NULL COMMENT '学校id',
+  `org_id` bigint(20) NULL DEFAULT NULL COMMENT '机构id',
   `user_id` bigint(20) NOT NULL COMMENT '消息接收人用户',
   `user_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名称',
   `mobile_number` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '电话号码',
+  `paper_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '试卷编号',
+  `course_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程代码',
   `message_type` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息类型',
   `business_operate` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务操作',
   `business_id` bigint(20) NULL DEFAULT NULL COMMENT '业务id',
   `template_code` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息模板代码',
   `variable_params` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '变量参数内容',
+  `template_content` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '模板内容',
   `send_status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送状态',
   `send_result` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送结果',
   `remark` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注',
@@ -60,9 +64,11 @@ CREATE TABLE `basic_message`  (
   `create_time` bigint(20) NULL DEFAULT NULL COMMENT '创建时间',
   `update_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
   `update_time` bigint(20) NULL DEFAULT NULL COMMENT '更新时间',
+  `resend_count` int(11) NULL DEFAULT NULL COMMENT '重试次数',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for basic_school
 -- ----------------------------
@@ -84,10 +90,6 @@ CREATE TABLE `basic_school`  (
   UNIQUE INDEX `code`(`code`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '学校表' ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of basic_school
--- ----------------------------
-INSERT INTO `basic_school` VALUES (1, 'whdx', '武汉大学', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for basic_verify_code
@@ -109,6 +111,70 @@ CREATE TABLE `basic_verify_code`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '短信验证码记录表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for cloud_marking_exam
+-- ----------------------------
+DROP TABLE IF EXISTS `cloud_marking_exam`;
+CREATE TABLE `cloud_marking_exam`  (
+  `id` bigint(20) NOT NULL,
+  `exam_id` int(5) NULL DEFAULT NULL COMMENT '云阅卷ID',
+  `exam_name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '云阅卷考试名称',
+  `create_id` bigint(20) NULL DEFAULT NULL,
+  `create_time` bigint(20) NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '云阅卷考试表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for cloud_marking_score
+-- ----------------------------
+DROP TABLE IF EXISTS `cloud_marking_score`;
+CREATE TABLE `cloud_marking_score`  (
+  `id` bigint(20) NOT NULL,
+  `school_id` bigint(20) NULL DEFAULT NULL COMMENT '学校ID',
+  `semester_id` bigint(20) NULL DEFAULT NULL COMMENT '学期ID',
+  `exam_type_id` bigint(20) NULL DEFAULT NULL COMMENT '考试类型ID',
+  `exam_id` int(5) NULL DEFAULT NULL COMMENT '云阅卷考试ID',
+  `exam_code` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '云阅卷考试Code',
+  `exam_number` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '准考证号',
+  `student_code` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学号',
+  `name` varchar(150) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学生姓名',
+  `subject_code` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '科目名称',
+  `paper_type` varchar(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '试卷类型',
+  `college` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学院',
+  `class_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '班级',
+  `teacher` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '老师',
+  `status` int(1) NULL DEFAULT NULL COMMENT '状态：1-正常，2-缺考(包含未上传)，3-违纪',
+  `sheet_urls` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '原卷地址',
+  `total_score` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '总分',
+  `objective_score` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客观题总分',
+  `subjective_score` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主观题总分',
+  `objective_score_detail` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '客观题小题分',
+  `subjective_score_detail` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '主观题小题分',
+  `mark_tags` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '阅卷轨迹',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '云阅卷成绩表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for cloud_marking_score_foreign
+-- ----------------------------
+DROP TABLE IF EXISTS `cloud_marking_score_foreign`;
+CREATE TABLE `cloud_marking_score_foreign`  (
+  `id` bigint(20) NOT NULL,
+  `school_id` bigint(20) NULL DEFAULT NULL COMMENT '学校ID（内部用）',
+  `semester_id` bigint(20) NULL DEFAULT NULL COMMENT '学期ID（内部用）',
+  `exam_type_id` bigint(20) NULL DEFAULT NULL COMMENT '考试类型ID（内部用）',
+  `exam_id` int(20) NULL DEFAULT NULL COMMENT '云阅卷考试ID（内部用）',
+  `xnm` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学年',
+  `xqm` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学期',
+  `jxb_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '教学班ID',
+  `kch` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程号',
+  `kcmc` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程名称',
+  `xh` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学号',
+  `xmcj` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '成绩',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '对外输出成绩表' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for exam_download_record
 -- ----------------------------
@@ -164,10 +230,6 @@ CREATE TABLE `exam_semester`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '学期表' ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of exam_semester
--- ----------------------------
-INSERT INTO `exam_semester` VALUES (1, 1, '2021-2022学年度第1学期', NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for exam_sync_student
@@ -262,6 +324,7 @@ CREATE TABLE `exam_sync_total`  (
 DROP TABLE IF EXISTS `exam_type`;
 CREATE TABLE `exam_type`  (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint(20) NULL DEFAULT NULL,
   `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
   `create_id` bigint(20) NULL DEFAULT NULL,
   `create_time` bigint(20) NULL DEFAULT NULL,
@@ -270,11 +333,6 @@ CREATE TABLE `exam_type`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考试类型' ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of exam_type
--- ----------------------------
-INSERT INTO `exam_type` VALUES (1, '期末考试', NULL, NULL, NULL, NULL);
-INSERT INTO `exam_type` VALUES (2, '期中考试', NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for qrtz_blob_triggers
@@ -313,11 +371,6 @@ CREATE TABLE `qrtz_cron_triggers`  (
   PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of qrtz_cron_triggers
--- ----------------------------
-INSERT INTO `qrtz_cron_triggers` VALUES ('ClusterQuartz', 'TIMED_SYNC_SCHOOL_JOB', 'TIMED_SYNC_SCHOOL_JOB', '0 0 0 * * ?', 'Asia/Shanghai');
-INSERT INTO `qrtz_cron_triggers` VALUES ('ClusterQuartz', 'TIMED_SYNC_TASK_JOB', 'TIMED_SYNC_TASK_JOB', '0 0 0 * * ?', 'Asia/Shanghai');
 
 -- ----------------------------
 -- Table structure for qrtz_fired_triggers
@@ -366,11 +419,6 @@ CREATE TABLE `qrtz_job_details`  (
   INDEX `IDX_QRTZ_J_GRP`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of qrtz_job_details
--- ----------------------------
-INSERT INTO `qrtz_job_details` VALUES ('ClusterQuartz', 'TIMED_SYNC_SCHOOL_JOB', 'TIMED_SYNC_SCHOOL_JOB', NULL, 'com.qmth.eds.job.service.TimedSyncSchoolJob', '0', '0', '0', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000017400046E616D6574002B636F6D2E716D74682E6564732E6A6F622E736572766963652E54696D656453796E635363686F6F6C4A6F627800);
-INSERT INTO `qrtz_job_details` VALUES ('ClusterQuartz', 'TIMED_SYNC_TASK_JOB', 'TIMED_SYNC_TASK_JOB', NULL, 'com.qmth.eds.job.service.TimedSyncTaskJob', '0', '0', '0', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000017400046E616D65740029636F6D2E716D74682E6564732E6A6F622E736572766963652E54696D656453796E635461736B4A6F627800);
 
 -- ----------------------------
 -- Table structure for qrtz_locks
@@ -382,11 +430,6 @@ CREATE TABLE `qrtz_locks`  (
   PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of qrtz_locks
--- ----------------------------
-INSERT INTO `qrtz_locks` VALUES ('ClusterQuartz', 'STATE_ACCESS');
-INSERT INTO `qrtz_locks` VALUES ('ClusterQuartz', 'TRIGGER_ACCESS');
 
 -- ----------------------------
 -- Table structure for qrtz_paused_trigger_grps
@@ -410,10 +453,6 @@ CREATE TABLE `qrtz_scheduler_state`  (
   PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of qrtz_scheduler_state
--- ----------------------------
-INSERT INTO `qrtz_scheduler_state` VALUES ('ClusterQuartz', 'LAPTOP-6S36IRLP1653273977862', 1653275046573, 5000);
 
 -- ----------------------------
 -- Table structure for qrtz_simple_triggers
@@ -487,11 +526,6 @@ CREATE TABLE `qrtz_triggers`  (
   INDEX `IDX_QRTZ_T_NFT_ST_MISFIRE_GRP`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of qrtz_triggers
--- ----------------------------
-INSERT INTO `qrtz_triggers` VALUES ('ClusterQuartz', 'TIMED_SYNC_SCHOOL_JOB', 'TIMED_SYNC_SCHOOL_JOB', 'TIMED_SYNC_SCHOOL_JOB', 'TIMED_SYNC_SCHOOL_JOB', NULL, 1653321600000, 1653266528336, 5, 'WAITING', 'CRON', 1652946042000, 0, NULL, 0, '');
-INSERT INTO `qrtz_triggers` VALUES ('ClusterQuartz', 'TIMED_SYNC_TASK_JOB', 'TIMED_SYNC_TASK_JOB', 'TIMED_SYNC_TASK_JOB', 'TIMED_SYNC_TASK_JOB', NULL, 1653321600000, -1, 5, 'WAITING', 'CRON', 1653273980000, 0, NULL, 0, '');
 
 -- ----------------------------
 -- Table structure for sys_config
@@ -532,6 +566,7 @@ CREATE TABLE `sys_org`  (
   UNIQUE INDEX `org_schoolId_name_idx`(`school_id`, `name`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '学校组织架构' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for sys_privilege
 -- ----------------------------
@@ -579,6 +614,22 @@ INSERT INTO `sys_privilege` VALUES (21, '考试类型管理', 'ExamTypeManage',
 INSERT INTO `sys_privilege` VALUES (22, '考试类型管理-查询', '/api/exam_type/list', 'URL', 21, 1, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (23, '学校管理', 'SchoolManage', 'MENU', NULL, 8, NULL, NULL, 0, 1, 1);
 INSERT INTO `sys_privilege` VALUES (24, '学校管理-查询', '/api/basic_school/list', 'URL', 23, 1, 'SYS', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (25, '学期管理-分页', '/api/exam_semester/page', 'URL', 17, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (26, '学期管理-新增/修改', '/api/exam_semester/save', 'URL', 17, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (27, '学期管理-删除', '/api/exam_semester/delete', 'URL', 17, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (28, '考试类型管理-分页', '/api/exam_type/page', 'URL', 21, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (29, '考试类型管理-新增/修改', '/api/exam_type/save', 'URL', 21, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (30, '考试类型管理-删除', '/api/exam_type/delete', 'URL', 21, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (31, '用户管理-删除', '/api/sys_user/delete', 'URL', 1, 5, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (32, '成绩回传', 'uploadScore', 'MENU', NULL, 3, NULL, NULL, 0, 1, 1);
+INSERT INTO `sys_privilege` VALUES (33, '云阅卷数据管理', 'cloudMarkingManage', 'MENU', 32, 1, NULL, NULL, 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (34, '云阅卷考试-列表', '/api/cloud_marking_exam/list', 'URL', 33, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (35, '云阅卷考试-同步', '/api/cloud_marking_exam/sync', 'URL', 33, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (36, '云阅卷成绩-同步', '/api/cloud_marking_score/sync_student_score', 'URL', 33, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (37, '云阅卷成绩-查询', '/api/cloud_marking_score/page', 'URL', 33, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (38, '回传数据管理', 'cloudMarkingForeignManage', 'MENU', 32, 2, NULL, NULL, 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (39, '回传数据管理-列表', '/api/cloud_marking_score_foreign/page', 'URL', 38, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (40, '回传数据管理-下载', '/api/cloud_marking_score_foreign/download_score', 'URL', 38, 2, 'AUTH', NULL, 1, 1, 1);
 
 -- ----------------------------
 -- Table structure for sys_role
@@ -617,11 +668,9 @@ CREATE TABLE `sys_role_privilege`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
 
-INSERT INTO `sys_role_privilege` VALUES (1, 1, 1, 1);
-INSERT INTO `sys_role_privilege` VALUES (2, 1, 2, 1);
-INSERT INTO `sys_role_privilege` VALUES (3, 1, 3, 1);
-INSERT INTO `sys_role_privilege` VALUES (4, 1, 4, 1);
-INSERT INTO `sys_role_privilege` VALUES (5, 1, 5, 1);
+-- ----------------------------
+-- Records of sys_role_privilege
+-- ----------------------------
 INSERT INTO `sys_role_privilege` VALUES (6, 2, 6, 1);
 INSERT INTO `sys_role_privilege` VALUES (7, 2, 7, 1);
 INSERT INTO `sys_role_privilege` VALUES (8, 2, 8, 1);
@@ -633,6 +682,15 @@ INSERT INTO `sys_role_privilege` VALUES (13, 2, 13, 1);
 INSERT INTO `sys_role_privilege` VALUES (14, 2, 14, 1);
 INSERT INTO `sys_role_privilege` VALUES (15, 2, 15, 1);
 INSERT INTO `sys_role_privilege` VALUES (16, 2, 16, 1);
+INSERT INTO `sys_role_privilege` VALUES (32, 2, 32, 1);
+INSERT INTO `sys_role_privilege` VALUES (33, 2, 33, 1);
+INSERT INTO `sys_role_privilege` VALUES (34, 2, 34, 1);
+INSERT INTO `sys_role_privilege` VALUES (35, 2, 35, 1);
+INSERT INTO `sys_role_privilege` VALUES (36, 2, 36, 1);
+INSERT INTO `sys_role_privilege` VALUES (37, 2, 37, 1);
+INSERT INTO `sys_role_privilege` VALUES (38, 2, 38, 1);
+INSERT INTO `sys_role_privilege` VALUES (39, 2, 39, 1);
+INSERT INTO `sys_role_privilege` VALUES (40, 2, 40, 1);
 
 -- ----------------------------
 -- Table structure for sys_user
@@ -663,8 +721,7 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (261436544282263552, NULL, '18800000000', '管理员', NULL, 'MTExMTEx', '18800000000', NULL, 1, 0, NULL, NULL, NULL, 1653272129418, NULL, 1653272129418);
-
+INSERT INTO `sys_user` VALUES (1, 1, '18800000000', 'admin', NULL, 'MTIzNDU2', '18800000000', NULL, 1, 0, NULL, NULL, NULL, NULL, NULL, 1653272598854);
 -- ----------------------------
 -- Table structure for sys_user_role
 -- ----------------------------
@@ -681,7 +738,7 @@ CREATE TABLE `sys_user_role`  (
 -- ----------------------------
 -- Records of sys_user_role
 -- ----------------------------
-INSERT INTO `sys_user_role` VALUES (1, 261436544282263552, 1, NULL, 1);
+INSERT INTO `sys_user_role` VALUES (1, 1, 1, NULL, 1);
 
 -- ----------------------------
 -- Table structure for t_b_session
@@ -706,6 +763,7 @@ CREATE TABLE `t_b_session`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '会话表' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for t_b_sync_task
 -- ----------------------------
@@ -715,6 +773,7 @@ CREATE TABLE `t_b_sync_task`  (
   `school_id` bigint(20) NULL DEFAULT NULL COMMENT '学校id',
   `semester_id` bigint(20) NULL DEFAULT NULL COMMENT '学期ID',
   `exam_type_id` bigint(20) NULL DEFAULT NULL COMMENT '考试类型ID',
+  `type` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
   `sync_time` bigint(20) NULL DEFAULT NULL COMMENT '执行时间',
   `status` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成',
   `result` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据结果，SUCCESS：成功，ERROR：失败',
@@ -727,6 +786,7 @@ CREATE TABLE `t_b_sync_task`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '云阅卷同步任务表' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for t_b_task
 -- ----------------------------
@@ -772,4 +832,24 @@ CREATE TABLE `t_g_error`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '全局异常错误信息表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for t_s_auth
+-- ----------------------------
+DROP TABLE IF EXISTS `t_s_auth`;
+CREATE TABLE `t_s_auth`  (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `school_id` bigint(20) NOT NULL COMMENT '学校id',
+  `access_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'accessKey',
+  `access_secret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'accessSecret',
+  `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '离线授权证书',
+  `type` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '授权类型',
+  `create_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` bigint(20) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` bigint(20) NULL DEFAULT NULL COMMENT '更新时间',
+  `expire_time` bigint(20) NULL DEFAULT NULL COMMENT '过期时间',
+  `file` mediumblob NULL COMMENT '文件数据',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '激活授权配置表' ROW_FORMAT = Dynamic;
+
 SET FOREIGN_KEY_CHECKS = 1;