3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -237,7 +237,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         if (Objects.nonNull(dbUser)) {
             if (!name.equals(dbUser.getRealName())) {
                 // 用户名称不一致
-                throw ExceptionResultEnum.ERROR.exception("工号[" + code + "]的教师用户名称错误");
+                throw ExceptionResultEnum.ERROR.exception("用户名/工号[" + code + "]的教师用户名称错误");
             } else {
                 teacherId = dbUser.getId();
                 // 判断在该教师团队下已经存在该教师

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

@@ -208,3 +208,6 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('490', '列表查询', '/api/admin/mark/archive/student/list', 'URL', '488', '1', 'AUTH', NULL, '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('494', '报告数据', '/api/admin/mark/archive/score/report', 'URL', '489', '1', 'AUTH', '1', '1', '1');
 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';

distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -88,9 +88,7 @@ public class SysAdminSetController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步配置信息", response = SysAdminSetResult.class)})
     @RequestMapping(value = "/sync/select", method = RequestMethod.POST)
     public Result sysadminSyncSelect(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) {
-        SysConfig sysConfigCloudMarkSyncMode = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_SYNC_MODE);
         SysConfig sysConfigQuestionHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.QUESTION_HOST_URL);
-        SysConfig sysConfigCloudmarkHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         SysConfig sysConfigTeachcloudReportHostUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         SysConfig sysConfigOpenFlowMsgPush = commonCacheService.addSysConfigCache(schoolId, SystemConstant.OPEN_FLOW_MESSAGE_PUSH);
         SysConfig sysConfigFlowMsgType = commonCacheService.addSysConfigCache(schoolId, SystemConstant.FLOW_MESSAGE_TYPE);
@@ -103,24 +101,6 @@ public class SysAdminSetController {
             sysConfigResultList.add(new SysConfigResult(null, SystemConstant.QUESTION_HOST_URL, "题库地址", "", 1));
         }
 
-        if (Objects.nonNull(sysConfigCloudmarkHostUrl)) {
-            sysConfigResultList.add(new SysConfigResult(sysConfigCloudmarkHostUrl));
-        } else {
-            sysConfigResultList.add(new SysConfigResult(null, SystemConstant.CLOUDMARK_HOST_URL, "云阅卷地址", "", 2));
-        }
-
-        SysConfigResult sysConfigResult;
-        if (Objects.nonNull(sysConfigCloudMarkSyncMode)) {
-            sysConfigResult = new SysConfigResult(sysConfigCloudMarkSyncMode);
-        } else {
-            sysConfigResult = new SysConfigResult(null, SystemConstant.CLOUDMARK_SYNC_MODE, "云阅卷同步规则", SyncModeEnum.BY_SCHOOL.name(), 3);
-        }
-        List<SysConfigResultOption> options = new ArrayList<>();
-        options.add(new SysConfigResultOption(SyncModeEnum.BY_SCHOOL.getTitle(), SyncModeEnum.BY_SCHOOL.name()));
-        options.add(new SysConfigResultOption(SyncModeEnum.BY_COLLEGE.getTitle(), SyncModeEnum.BY_COLLEGE.name()));
-        sysConfigResult.setOptions(options);
-        sysConfigResultList.add(sysConfigResult);
-
         if (Objects.nonNull(sysConfigTeachcloudReportHostUrl)) {
             sysConfigResultList.add(new SysConfigResult(sysConfigTeachcloudReportHostUrl));
         } else {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicCourseImportDto.java

@@ -39,8 +39,8 @@ public class BasicCourseImportDto implements Serializable {
     @ExcelProperty(name = "姓名", width = 30, index = 5)
     private String name;
 
-    @ExcelNote(value = "工号")
-    @ExcelProperty(name = "工号", width = 30, index = 6)
+    @ExcelNote(value = "用户名/工号")
+    @ExcelProperty(name = "用户名/工号", width = 30, index = 6)
     private String code;
 
     @ApiModelProperty("行索引")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -164,8 +164,6 @@ public class SystemConstant {
     public static final String THREAD_POOL_CORE_SIZE = "thread.pool.core.size";
     public static final String CUSTOM_THREAD_POOL_CORE_SIZE = "custom.thread.pool.core.size";
     public static final String SESSION_ACTIVE = "session.active";
-    public static final String CLOUDMARK_SYNC_MODE = "cloudmark.sync.mode";
-    public static final String CLOUDMARK_HOST_URL = "cloudmark.host.url";
     public static final String SMS_NORMAL_CODE = "sms.normal.code";
     public static final String CODE_EXPIRED_TIME = "code.expired.time";
     public static final String CODE_SEND_INTERVAL = "code.send.interval";

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -545,6 +545,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 String password = StringUtils.isNoneBlank(basicSchool.getInitPassword()) ? basicSchool.getInitPassword() : Base64Util.encode(SystemConstant.INIT_PASSWORD.getBytes());
                 sysUser.setPassword(password);
                 sysUser.setEnable(true);
+                sysUser.setCode(sysUser.getLoginName());
                 sysUserService.save(sysUser);
                 resultUserId = sysUser.getId();
                 commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
@@ -561,7 +562,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         .set(SysUser::getSchoolId, userSaveParams.getSchoolId())
                         .set(SysUser::getLoginName, sysUser.getLoginName())
                         .set(SysUser::getRealName, sysUser.getRealName())
-//                        .set(SysUser::getCode, sysUser.getCode())
+                        .set(SysUser::getCode, sysUser.getLoginName())
                         .set(SysUser::getAllowManualCard, sysUser.getAllowManualCard())
                         .set(SysUser::getMobileNumber, sysUser.getMobileNumber())
                         .set(SysUser::getOrgId, sysUser.getOrgId())

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ExcelUtil.java

@@ -315,9 +315,9 @@ public class ExcelUtil {
                     return String.valueOf(cell.getRichStringCellValue().getString());
                 }
             case STRING:
-                return cell.getStringCellValue();
+                return StringUtils.trimToEmpty(cell.getStringCellValue());
             case FORMULA:
-                return cell.getCellFormula();
+                return StringUtils.trimToEmpty(cell.getCellFormula());
             case BOOLEAN:
                 return cell.getBooleanCellValue();
             case ERROR:

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/NewCallApiServiceImpl.java

@@ -56,9 +56,12 @@ public class NewCallApiServiceImpl implements NewCallApiService {
         if (Objects.isNull(tbCloudExam)) {
             throw ExceptionResultEnum.ERROR.exception("找不到该考试");
         }
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(tbCloudExam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
-        String url = sysConfig.getConfigValue();
+
+        // todo 教研分析取成绩修改 2023-11-21
+//        SysConfig sysConfig = commonCacheService.addSysConfigCache(tbCloudExam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
+//        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
+//        String url = sysConfig.getConfigValue();
+        String url = null;
 
         int pageNumber = 1;
         int pageSize = 100;