3.3.0 fix

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -130,7 +130,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1003', '任务释放', '/api/scan/task/omr/release', 'URL', '970', '33', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1004', '任务历史', '/api/scan/task/omr/history', 'URL', '970', '34', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1005', '答题卡二次识别', '/api/scan/answer/refix', 'URL', '970', '35', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`,`related`, `enable`, `default_auth`, `front_display`) VALUES ('1006', '查询条件', 'Condition', 'CONDITION', '970', '1', 'AUTH','971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000,1001,1002,1003,1004,1005,1007', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`,`related`, `enable`, `default_auth`, `front_display`) VALUES ('1006', '查询条件', 'Condition', 'CONDITION', '970', '1', 'AUTH','971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000,1001,1002,1003,1004,1005,1007', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1007', '未扫描-导出', '/api/scan/student/unexist/export', 'URL', '970', '36', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1008', '仲裁-评卷历史', '/api/admin/mark/arbitrate/getHistory', 'URL', '917', '20', 'AUTH', '1', '1', '1');
 DELETE FROM `sys_privilege` WHERE (`id` = '392');
@@ -210,4 +210,16 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1009', '任务列表', '/api/scan/task/omr/list', 'URL', '970', '37', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `property` = 'SYS' WHERE (`id` = '370');
 delete from sys_config  where config_key = 'cloudmark.host.url';
-delete from sys_config  where config_key = 'cloudmark.sync.mode';
+delete from sys_config  where config_key = 'cloudmark.sync.mode';
+DELETE FROM `sys_privilege` WHERE (`id` = '546');
+DELETE FROM `sys_privilege` WHERE (`id` = '545');
+DELETE FROM `sys_privilege` WHERE (`id` = '544');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('544', '报告下载', '/api/admin/mark/archive/score/report/download', 'URL', '488', '3', 'AUTH', '1', '1', '1');
+UPDATE `sys_privilege` SET `related` = '490,543,544' WHERE (`id` = '488');
+DELETE FROM `sys_privilege` WHERE (`id` = '502');
+DELETE FROM `sys_privilege` WHERE (`id` = '563');
+DELETE FROM `sys_privilege` WHERE (`id` = '504');
+DELETE FROM `sys_privilege` WHERE (`id` = '505');
+UPDATE `sys_privilege` SET `related` = '490,543' WHERE (`id` = '488');
+UPDATE `sys_privilege` SET `related` = '494,544' WHERE (`id` = '489');
+UPDATE `sys_privilege` SET `parent_id` = '489', `sequence` = '2' WHERE (`id` = '544');

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanController.java

@@ -99,7 +99,7 @@ public class ScanController {
         LoginClientResult loginClientResult = new LoginClientResult(sysUser, loginResult);
         loginClientResult.setRoleList(roles);
         loginClientResult.setCanAddCard(sysUser.getAllowManualCard());
-        return ResultUtil.ok(new LoginClientResult(sysUser, loginResult));
+        return ResultUtil.ok(loginClientResult);
     }
 
     @Aac(auth = false)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/TrackDTO.java

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import java.io.Serializable;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.mark.entity.*;
 import com.qmth.teachcloud.mark.params.MarkHeaderGroupResult;
 
@@ -68,6 +69,7 @@ public class TrackDTO implements Serializable {
 
     public MarkTrack transform(MarkTask markTask, Long userId) {
         MarkTrack track = new MarkTrack();
+        track.setId(SystemConstant.getDbUuid());
         track.setTaskId(markTask.getId());
         track.setQuestionNumber(getMainNumber() + "." + getSubNumber());
         track.setNumber(getNumber());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkTrack.java

@@ -26,7 +26,7 @@ public class MarkTrack implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private Long id;
 
     @JsonSerialize(using = ToStringSerializer.class)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkUserGroup.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.mark.MarkMode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,6 +82,7 @@ public class MarkUserGroup implements Serializable {
     }
 
     public MarkUserGroup(Long examId, String paperNumber, Integer groupNumber, Long userId, MarkMode mode) {
+        this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.paperNumber = paperNumber;
         this.groupNumber = groupNumber;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -415,6 +415,7 @@ public class MarkServiceImpl implements MarkService {
                 int studentCount = studentList.size();
                 for (MarkStudent student : studentList) {
                     MarkTask markTask = new MarkTask();
+                    markTask.setId(SystemConstant.getDbUuid());
                     markTask.setExamId(student.getExamId());
                     markTask.setCourseCode(student.getCourseCode());
                     markTask.setCourseName(student.getCourseName());
@@ -442,6 +443,7 @@ public class MarkServiceImpl implements MarkService {
                         }
                         if (needDouble) {
                             markTask = new MarkTask();
+                            markTask.setId(SystemConstant.getDbUuid());
                             markTask.setExamId(student.getExamId());
                             markTask.setCourseCode(student.getCourseCode());
                             markTask.setCourseName(student.getCourseName());
@@ -1171,6 +1173,7 @@ public class MarkServiceImpl implements MarkService {
 
     private MarkArbitrateHistory buildArbitrateHistory(MarkTask task, Long now) {
         MarkArbitrateHistory history = new MarkArbitrateHistory();
+        history.setId(SystemConstant.getDbUuid());
         history.setExamId(task.getExamId());
         history.setPaperNumber(task.getPaperNumber());
         history.setGroupNumber(task.getGroupNumber());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserClassServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
 import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupDto;
 import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
@@ -102,6 +103,7 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
         List<MarkUserClass> markUserClasses = new ArrayList<>();
         for (MarkUser markUser : markClassUserParams.getClassMarkerList()) {
             MarkUserClass markUserClass = new MarkUserClass();
+            markUserClass.setId(SystemConstant.getDbUuid());
             markUserClass.setExamId(examId);
             markUserClass.setPaperNumber(paperNumber);
             markUserClass.setGroupNumber(groupNumber);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanBatchServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.mark.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.concurrent.service.ConcurrentService;
 import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.mark.bean.answerbatch.*;
@@ -206,6 +207,7 @@ public class ScanBatchServiceImpl extends ServiceImpl<ScanBatchMapper, ScanBatch
         // 构造全新paper对象
         if (paper == null) {
             paper = new ScanPaper();
+            paper.setId(SystemConstant.getDbUuid());
             paper.setCreateTime(System.currentTimeMillis());
             paper.setCreatorId(user.getId());
         }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanOmrTaskServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +104,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
 			}
 			Long paperId = spe.getPaperId();
 			ScanOmrTask task = new ScanOmrTask();
+			task.setId(SystemConstant.getDbUuid());
 			task.setCardNumber(paper.getCardNumber());
 			task.setExamId(paper.getExamId());
 			task.setConditions(c);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanPackageServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.mark.bean.scananswer.SheetUploadVo;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageFindVo;
@@ -93,6 +94,7 @@ public class ScanPackageServiceImpl extends ServiceImpl<ScanPackageMapper, ScanP
                         packageCode, packageNo);
                 if (sp == null) {
                     sp = new ScanPackage();
+                    sp.setId(SystemConstant.getDbUuid());
                     sp.setExamId(examId);
                     sp.setCoursePaperId(coursePaperId);
                     sp.setPackageCode(packageCode);