3.3.0 update

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

@@ -53,4 +53,6 @@ public interface BasicExamService extends IService<BasicExam> {
      * 启用/禁用
      */
     boolean enable(Long id, Boolean enable);
+
+    List<BasicExam> listBySemesterId(Long schoolId, Long id);
 }

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

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.service;
 
 import com.qmth.distributed.print.business.bean.result.PrintPlanBrief;
+import com.qmth.teachcloud.common.bean.dto.SemesterExamDto;
 import com.qmth.teachcloud.common.entity.*;
 
 import java.util.List;
@@ -25,4 +26,6 @@ public interface ConditionService {
     List<BasicClazz> listClazz(Long semesterId, Long examId, String courseCode, String clazzName);
 
     List<SysOrg> listCollege();
+
+    List<SemesterExamDto> scanSemesterList(Boolean enable);
 }

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

@@ -148,5 +148,14 @@ public class BasicExamServiceImpl extends ServiceImpl<BasicExamMapper, BasicExam
         return this.update(updateWrapper);
     }
 
+    @Override
+    public List<BasicExam> listBySemesterId(Long schoolId, Long semesterId) {
+        QueryWrapper<BasicExam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BasicExam::getSchoolId, schoolId)
+                .eq(BasicExam::getSemesterId, semesterId)
+                .orderByDesc(BasicExam::getId);
+        return this.list(queryWrapper);
+    }
+
 
 }

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

@@ -9,11 +9,13 @@ import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.distributed.print.business.service.ConditionService;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
+import com.qmth.teachcloud.common.bean.dto.SemesterExamDto;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -170,4 +172,32 @@ public class ConditionServiceImpl implements ConditionService {
                 .orderByAsc(SysOrg::getCreateTime);
         return sysOrgService.list(queryWrapper);
     }
+
+    @Override
+    public List<SemesterExamDto> scanSemesterList(Boolean enable) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        List<BasicSemester> semesterList = basicSemesterService.list(schoolId, enable);
+        List<SemesterExamDto> list = new ArrayList<>();
+        for (BasicSemester basicSemester : semesterList) {
+            SemesterExamDto semesterExamDto = new SemesterExamDto();
+            semesterExamDto.setId(String.valueOf(basicSemester.getId()));
+            semesterExamDto.setName(basicSemester.getName());
+            semesterExamDto.setEnable(basicSemester.getEnable());
+
+            List<BasicExam> examList = basicExamService.listBySemesterId(schoolId, basicSemester.getId());
+            if (CollectionUtils.isNotEmpty(examList)){
+                List<SemesterExamDto.ExamDto> examDtoList = new ArrayList<>();
+                for (BasicExam basicExam : examList) {
+                    SemesterExamDto.ExamDto examDto = new SemesterExamDto.ExamDto();
+                    examDto.setId(String.valueOf(basicExam.getId()));
+                    examDto.setName(basicExam.getName());
+                    examDto.setEnable(basicExam.getEnable());
+                    examDtoList.add(examDto);
+                }
+                semesterExamDto.setExamList(examDtoList);
+                list.add(semesterExamDto);
+            }
+        }
+        return list;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncSysUserDataImportService.java

@@ -63,14 +63,6 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
                     super.createErrorFile(tbTask, SysUserErrorExportDto.class, errorDataList);
                 }
             }
-
-//            // 执行用户同步数据
-//            SysUser sysUser = (SysUser) map.get(SystemConstant.SYS_USER);
-//            List<Long> userIdList = JSON.parseArray(String.valueOf(result.get("userIdList")), Long.class);
-//            if (userIdList != null && userIdList.size() > 0) {
-//                cloudUserPushService.pushCloudUser(userIdList, sysUser);
-//            }
-
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}{4}{5}{6}{7}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, Long.valueOf(String.valueOf(result.get(SystemConstant.DATA_COUNT))), FINISH_TOTAL_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.SUCCESS_DATA_COUNT))), FINISH_SUCCESS_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.ERROR_DATA_COUNT))), FINISH_ERROR_SIZE));
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -97,10 +97,6 @@ public abstract class AsyncImportTaskTemplete {
 
             tbTask.setSummary(summary);
             tbTask.setResult(TaskResultEnum.ERROR);
-//            TBTask dbTask = tbTaskService.getById(tbTask.getId());
-//            if (tbTask.getVersion() == dbTask.getVersion()) {
-//                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
-//            }
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, ((ApiException) e).getCode(), e.getMessage());
             } else {

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

@@ -90,9 +90,9 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `sequence`, `related`,
 UPDATE `sys_privilege` SET `name` = '打印端', `related` = '200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,973,974,975' WHERE (`id` = '199');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('971', '心跳接口', '/api/scan/server/heartbeat', 'URL', '970', '1', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('972', '登出接口', '/api/scan/logout', 'URL', '970', '2', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('973', '获取学期、考试列表', '/api/scan/semester/list', 'URL', '970', '3', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('974', '获取课程、试卷编号列表', '/api/scan/course/list', 'URL', '970', '4', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('975', '获取校区、考场', '/api/scan/campus/list', 'URL', '970', '5', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('973', '获取学期、考试列表', '/api/admin/basic/condition/scan/semester/list', 'URL', '970', '3', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('974', '获取课程、试卷编号列表', '/api/admin/basic/condition/scan/course/list', 'URL', '970', '4', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('975', '获取校区、考场', '/api/admin/basic/condition/scan/campus/list', 'URL', '970', '5', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('976', '扫描汇总-答题卡扫描、签到表扫描', '/api/scan/exam/card/info', 'URL', '970', '6', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('977', '扫描汇总-数据校对', '/api/scan/exam/check/info', 'URL', '970', '7', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('978', '答题卡卡格式列表', '/api/scan/answer/card/list', 'URL', '970', '8', 'AUTH', '1', '1', '1');

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

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.PrintPlanBrief;
 import com.qmth.distributed.print.business.service.ConditionService;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 查询条件
@@ -87,4 +89,11 @@ public class ConditionController {
     public Result listCollege() {
         return ResultUtil.ok(conditionService.listCollege());
     }
+
+    @ApiOperation(value = "获取学期、考试列表")
+    @RequestMapping(value = "/scan/semester/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Map.class)})
+    public Result scanSemesterList(@ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
+        return ResultUtil.ok(conditionService.scanSemesterList(enable));
+    }
 }

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

@@ -59,11 +59,6 @@ public class SysUserController {
     private PrintCommonService printCommonService;
     @Resource
     private AsyncSysUserDataImportService asyncSysUserDataImportService;
-    @Resource
-    private CloudUserPushService cloudUserPushService;
-    @Resource
-    private CloudUserPushStatusService cloudUserPushStatusService;
-
     /**
      * 用户列表查询
      *

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

@@ -3,10 +3,19 @@ package com.qmth.distributed.print.api.mark;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.Api;
+import com.qmth.teachcloud.common.entity.BasicSemester;
+import com.qmth.teachcloud.common.service.BasicSemesterService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.Map;
+
 /**
  * <p>
  * 扫描系统相关 前端控制器
@@ -20,4 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN)
 public class ScanController {
 
+    @Resource
+    BasicSemesterService basicSemesterService;
+
 }

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

@@ -0,0 +1,84 @@
+package com.qmth.teachcloud.common.bean.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.bean.result.SysUserResult;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 学期、考试
+ */
+public class SemesterExamDto {
+
+    private String id;
+    private String name;
+    private Boolean enable;
+
+    private List<ExamDto> examList;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public List<ExamDto> getExamList() {
+        return examList;
+    }
+
+    public void setExamList(List<ExamDto> examList) {
+        this.examList = examList;
+    }
+
+    public static class ExamDto{
+        private String id;
+        private String name;
+        private Boolean enable;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Boolean getEnable() {
+            return enable;
+        }
+
+        public void setEnable(Boolean enable) {
+            this.enable = enable;
+        }
+    }
+
+}

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

@@ -262,7 +262,7 @@ public class SystemConstant {
     public static final String JSON_PREFIX = ".json";
     public static final String FTL_PREFIX = ".ftl";
     public static final String ZIP_PREFIX = ".zip";
-    public static final String TXT_PREFIX = ".txt";
+    public static final String TXT_PREFIX = ".json";
     public static final String WINDOWS = "Windows";
 
     public static final String EXCEL_PREFIX = ".xlsx";

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkPaper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkPaper.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.mark.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkQuestion.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkQuestion.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.mark.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkStudent.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkStudent.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.mark.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/ScanAnswerCard.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/ScanAnswerCard.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.mark.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkPaperMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/MarkPaperMapper.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.mapper;
+package com.qmth.teachcloud.common.mapper;
 
-import com.qmth.teachcloud.mark.entity.MarkPaper;
+import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkQuestionMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/MarkQuestionMapper.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.mapper;
+package com.qmth.teachcloud.common.mapper;
 
-import com.qmth.teachcloud.mark.entity.MarkQuestion;
+import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkStudentMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/MarkStudentMapper.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.mapper;
+package com.qmth.teachcloud.common.mapper;
 
-import com.qmth.teachcloud.mark.entity.MarkStudent;
+import com.qmth.teachcloud.common.entity.MarkStudent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/ScanAnswerCardMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/ScanAnswerCardMapper.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.mapper;
+package com.qmth.teachcloud.common.mapper;
 
-import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
+import com.qmth.teachcloud.common.entity.ScanAnswerCard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkPaperService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/MarkPaperService.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.service;
+package com.qmth.teachcloud.common.service;
 
-import com.qmth.teachcloud.mark.entity.MarkPaper;
+import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkQuestionService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/MarkQuestionService.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.service;
+package com.qmth.teachcloud.common.service;
 
-import com.qmth.teachcloud.mark.entity.MarkQuestion;
+import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/MarkStudentService.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.service;
+package com.qmth.teachcloud.common.service;
 
-import com.qmth.teachcloud.mark.entity.MarkStudent;
+import com.qmth.teachcloud.common.entity.MarkStudent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/ScanAnswerCardService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/ScanAnswerCardService.java

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.mark.service;
+package com.qmth.teachcloud.common.service;
 
-import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
+import com.qmth.teachcloud.common.entity.ScanAnswerCard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -18,12 +18,10 @@ import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * <p>

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkPaperServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/MarkPaperServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.teachcloud.mark.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
-import com.qmth.teachcloud.mark.entity.MarkPaper;
-import com.qmth.teachcloud.mark.mapper.MarkPaperMapper;
-import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.entity.MarkPaper;
+import com.qmth.teachcloud.common.mapper.MarkPaperMapper;
+import com.qmth.teachcloud.common.service.MarkPaperService;
 import org.springframework.stereotype.Service;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkQuestionServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/MarkQuestionServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.teachcloud.mark.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
-import com.qmth.teachcloud.mark.entity.MarkQuestion;
-import com.qmth.teachcloud.mark.mapper.MarkQuestionMapper;
-import com.qmth.teachcloud.mark.service.MarkQuestionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.entity.MarkQuestion;
+import com.qmth.teachcloud.common.mapper.MarkQuestionMapper;
+import com.qmth.teachcloud.common.service.MarkQuestionService;
 import org.springframework.stereotype.Service;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/MarkStudentServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.teachcloud.mark.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
-import com.qmth.teachcloud.mark.entity.MarkStudent;
-import com.qmth.teachcloud.mark.mapper.MarkStudentMapper;
-import com.qmth.teachcloud.mark.service.MarkStudentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.entity.MarkStudent;
+import com.qmth.teachcloud.common.mapper.MarkStudentMapper;
+import com.qmth.teachcloud.common.service.MarkStudentService;
 import org.springframework.stereotype.Service;
 
 /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanAnswerCardServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/ScanAnswerCardServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.teachcloud.mark.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
-import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
-import com.qmth.teachcloud.mark.mapper.ScanAnswerCardMapper;
-import com.qmth.teachcloud.mark.service.ScanAnswerCardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.entity.ScanAnswerCard;
+import com.qmth.teachcloud.common.mapper.ScanAnswerCardMapper;
+import com.qmth.teachcloud.common.service.ScanAnswerCardService;
 import org.springframework.stereotype.Service;
 
 /**

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml → teachcloud-common/src/main/resources/mapper/MarkPaperMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkPaperMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.MarkPaperMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkPaper">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.MarkPaper">
         <result column="exam_id" property="examId" />
         <result column="course_code" property="courseCode" />
         <result column="course_name" property="courseName" />

teachcloud-mark/src/main/resources/mapper/MarkQuestionMapper.xml → teachcloud-common/src/main/resources/mapper/MarkQuestionMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkQuestionMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.MarkQuestionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkQuestion">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.MarkQuestion">
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml → teachcloud-common/src/main/resources/mapper/MarkStudentMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkStudentMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.MarkStudentMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkStudent">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.MarkStudent">
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="course_code" property="courseCode" />

teachcloud-mark/src/main/resources/mapper/ScanAnswerCardMapper.xml → teachcloud-common/src/main/resources/mapper/ScanAnswerCardMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.ScanAnswerCardMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.ScanAnswerCardMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.ScanAnswerCard">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.ScanAnswerCard">
         <id column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
         <result column="course_paper_id" property="coursePaperId" />