3.3.0 fix

distributed-print/src/main/java/com/qmth/distributed/print/DistributedPrintApplication.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print;
 
+import com.github.jeffreyning.mybatisplus.conf.EnableMPP;
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
 import com.qmth.distributed.print.auth.DistributedPrintAuthenticationService;
 import com.qmth.teachcloud.common.base.CustomizedSqlInjector;
@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.annotation.Resource;
 
+@EnableMPP
 @SpringBootApplication(scanBasePackages = "com.qmth.*", exclude = {SecurityAutoConfiguration.class})
 @MapperScan({"com.qmth.distributed.print.business.mapper", "com.qmth.teachcloud.report.business.mapper", "com.qmth.teachcloud.common.mapper", "com.qmth.teachcloud.mark.mapper"})
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
@@ -48,8 +50,8 @@ public class DistributedPrintApplication {
         return new MyThreadPool();
     }
 
-    @Bean
-    public CustomizedSqlInjector customizedSqlInjector() {
-        return new CustomizedSqlInjector();
-    }
+//    @Bean
+//    public CustomizedSqlInjector customizedSqlInjector() {
+//        return new CustomizedSqlInjector();
+//    }
 }

pom.xml

@@ -373,6 +373,11 @@
 <!--                <artifactId>maven-model</artifactId>-->
 <!--                <version>3.0</version>-->
 <!--            </dependency>-->
+            <dependency>
+                <groupId>com.github.jeffreyning</groupId>
+                <artifactId>mybatisplus-plus</artifactId>
+                <version>1.5.1-RELEASE</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

teachcloud-common/pom.xml

@@ -177,5 +177,9 @@
 <!--            <groupId>org.apache.maven</groupId>-->
 <!--            <artifactId>maven-model</artifactId>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+        </dependency>
     </dependencies>
 </project>

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.mark.bean.mark.MarkConfigItem;
 import com.qmth.teachcloud.mark.dto.mark.ScoreItem;
@@ -36,7 +37,7 @@ public class MarkGroup implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @MppMultiId(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "课程代码")
@@ -46,9 +47,11 @@ public class MarkGroup implements Serializable {
     private String courseName;
 
     @ApiModelProperty(value = "试卷编号")
+    @MppMultiId(value = "paper_number")
     private String paperNumber;
 
     @ApiModelProperty(value = "序号")
+    @MppMultiId(value = "number")
     private Integer number;
 
     @ApiModelProperty(value = "小图配置")

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

@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,13 +27,15 @@ public class MarkHeaderSubjectiveScore implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考生ID")
-    @TableId(value = "student_id")
+    @MppMultiId(value = "student_id")
     private Long studentId;
 
     @ApiModelProperty(value = "大题号")
+    @MppMultiId(value = "main_number")
     private Integer mainNumber;
 
     @ApiModelProperty(value = "小题号")
+    @MppMultiId(value = "sub_number")
     private String subNumber;
 
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,13 +27,15 @@ public class MarkHeaderTrack implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考生ID")
-    @TableId(value = "student_id")
+    @MppMultiId(value = "student_id")
     private Long studentId;
 
     @ApiModelProperty(value = "完整题号")
+    @MppMultiId(value = "question_number")
     private String questionNumber;
 
     @ApiModelProperty(value = "序号")
+    @MppMultiId(value = "number")
     private Integer number;
 
     @JsonSerialize(using = ToStringSerializer.class)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkSubjectiveScore.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.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -25,13 +26,15 @@ public class MarkSubjectiveScore implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考生ID")
-    @TableId(value = "student_id")
+    @MppMultiId(value = "student_id")
     private Long studentId;
 
     @ApiModelProperty(value = "大题号")
+    @MppMultiId(value = "main_number")
     private Integer mainNumber;
 
     @ApiModelProperty(value = "小题号")
+    @MppMultiId(value = "sub_number")
     private Integer subNumber;
 
     @JsonSerialize(using = ToStringSerializer.class)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkGroupMapper.java

@@ -1,5 +1,6 @@
 package com.qmth.teachcloud.mark.mapper;
 
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.qmth.teachcloud.mark.entity.MarkGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author xf
  * @since 2023-09-22
  */
-public interface MarkGroupMapper extends BaseMapper<MarkGroup> {
+public interface MarkGroupMapper extends MppBaseMapper<MarkGroup> {
 
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkHeaderSubjectiveScoreMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.mark.mapper;
 
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author xf
  * @since 2023-09-22
  */
-public interface MarkHeaderSubjectiveScoreMapper extends BaseMapper<MarkHeaderSubjectiveScore> {
+public interface MarkHeaderSubjectiveScoreMapper extends MppBaseMapper<MarkHeaderSubjectiveScore> {
 
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkHeaderTrackMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.mark.mapper;
 
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.qmth.teachcloud.mark.entity.MarkHeaderTrack;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author xf
  * @since 2023-09-22
  */
-public interface MarkHeaderTrackMapper extends BaseMapper<MarkHeaderTrack> {
+public interface MarkHeaderTrackMapper extends MppBaseMapper<MarkHeaderTrack> {
 
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkSubjectiveScoreMapper.java

@@ -1,13 +1,11 @@
 package com.qmth.teachcloud.mark.mapper;
 
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.qmth.teachcloud.mark.bean.archivescore.QuestionVo;
 import com.qmth.teachcloud.mark.entity.MarkSubjectiveScore;
-
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
 
 /**
  * <p>
@@ -17,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author xf
  * @since 2023-09-22
  */
-public interface MarkSubjectiveScoreMapper extends BaseMapper<MarkSubjectiveScore> {
+public interface MarkSubjectiveScoreMapper extends MppBaseMapper<MarkSubjectiveScore> {
 
 	List<QuestionVo> getSubjectiveVo(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 

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

@@ -6,6 +6,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.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 import com.qmth.teachcloud.common.bean.dto.mark.PictureConfig;
 import com.qmth.teachcloud.common.bean.params.mark.setting.GroupPictureConfigParams;
@@ -42,7 +43,7 @@ import java.util.stream.Collectors;
  * @since 2023-09-22
  */
 @Service
-public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup> implements MarkGroupService {
+public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGroup> implements MarkGroupService {
 
     @Resource
     private MarkQuestionService markQuestionService;
@@ -291,7 +292,7 @@ public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup
         markGroup.setTaskCount(0);
         markGroup.setMarkedCount(0);
         markGroup.setLeftCount(0);
-        this.save(markGroup);
+        this.saveOrUpdateByMultiId(markGroup);
 
         // 题目
         for (MarkQuestion markQuestion : questions) {
@@ -359,7 +360,7 @@ public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup
         markGroup.setScorePolicy(markGroupDto.getScorePolicy());
         markGroup.setArbitrateThreshold(markGroupDto.getArbitrateThreshold());
         markGroup.setPicList(JSON.toJSONString(markGroupDto.getPictureConfigs()));
-        this.updateById(markGroup);
+        this.updateByMultiId(markGroup);
 
         // 结构分组号
         markQuestionService.updateGroupNumberByExamIdAndPaperNumberAndGroupNumber(null, examId, paperNumber, markGroupDto.getGroupNumber());

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

@@ -1,9 +1,9 @@
 package com.qmth.teachcloud.mark.service.impl;
 
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore;
 import com.qmth.teachcloud.mark.mapper.MarkHeaderSubjectiveScoreMapper;
 import com.qmth.teachcloud.mark.service.MarkHeaderSubjectiveScoreService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-09-22
  */
 @Service
-public class MarkHeaderSubjectiveScoreServiceImpl extends ServiceImpl<MarkHeaderSubjectiveScoreMapper, MarkHeaderSubjectiveScore> implements MarkHeaderSubjectiveScoreService {
+public class MarkHeaderSubjectiveScoreServiceImpl extends MppServiceImpl<MarkHeaderSubjectiveScoreMapper, MarkHeaderSubjectiveScore> implements MarkHeaderSubjectiveScoreService {
 
 }

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

@@ -1,16 +1,15 @@
 package com.qmth.teachcloud.mark.service.impl;
 
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.qmth.teachcloud.mark.entity.MarkHeaderTrack;
 import com.qmth.teachcloud.mark.mapper.MarkHeaderTrackMapper;
 import com.qmth.teachcloud.mark.service.MarkHeaderTrackService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -21,7 +20,7 @@ import com.qmth.teachcloud.mark.service.MarkHeaderTrackService;
  * @since 2023-09-22
  */
 @Service
-public class MarkHeaderTrackServiceImpl extends ServiceImpl<MarkHeaderTrackMapper, MarkHeaderTrack> implements MarkHeaderTrackService {
+public class MarkHeaderTrackServiceImpl extends MppServiceImpl<MarkHeaderTrackMapper, MarkHeaderTrack> implements MarkHeaderTrackService {
 
     @Override
     public List<MarkHeaderTrack> listByExamAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId) {

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

@@ -2,7 +2,7 @@ package com.qmth.teachcloud.mark.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.qmth.teachcloud.mark.bean.archivescore.QuestionVo;
 import com.qmth.teachcloud.mark.entity.MarkSubjectiveScore;
 import com.qmth.teachcloud.mark.mapper.MarkSubjectiveScoreMapper;
@@ -22,7 +22,7 @@ import java.util.Set;
  * @since 2023-09-22
  */
 @Service
-public class MarkSubjectiveScoreServiceImpl extends ServiceImpl<MarkSubjectiveScoreMapper, MarkSubjectiveScore> implements MarkSubjectiveScoreService {
+public class MarkSubjectiveScoreServiceImpl extends MppServiceImpl<MarkSubjectiveScoreMapper, MarkSubjectiveScore> implements MarkSubjectiveScoreService {
 
     @Override
     public List<MarkSubjectiveScore> listByStudentIdAndGroupNumber(Long studentId, Integer groupNumber) {

teachcloud-mark/src/main/resources/mapper/MarkGroupMapper.xml

@@ -5,8 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkGroup">
         <id column="exam_id" property="examId" />
-        <result column="paper_number" property="paperNumber" />
-        <result column="number" property="number" />
+        <id column="paper_number" property="paperNumber" />
+        <id column="number" property="number" />
         <result column="pic_list" property="picList" />
         <result column="total_score" property="totalScore" />
         <result column="double_rate" property="doubleRate" />

teachcloud-mark/src/main/resources/mapper/MarkGroupStudentMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkGroupStudent">
-        <id column="student_id" property="studentId" />
+        <id column="id" property="id" />
+        <result column="student_id" property="studentId" />
         <result column="group_number" property="groupNumber" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />

teachcloud-mark/src/main/resources/mapper/MarkHeaderSubjectiveScoreMapper.xml

@@ -5,8 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore">
         <id column="student_id" property="studentId" />
-        <result column="main_number" property="mainNumber" />
-        <result column="sub_number" property="subNumber" />
+        <id column="main_number" property="mainNumber" />
+        <id column="sub_number" property="subNumber" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
         <result column="group_number" property="groupNumber" />