同步1.9.0

orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml

@@ -65,20 +65,23 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml

@@ -64,20 +64,23 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
+    <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -99,6 +102,7 @@
     <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.orange.demo:common-log:1.0.0" level="project" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.4" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.63.Final" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>course-class-api</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-log</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.orange.demo</groupId>
             <artifactId>common-redis</artifactId>

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java

@@ -1,8 +1,9 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 行政区划实体对象。
  *
@@ -10,30 +11,31 @@ import lombok.Data;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_area_code")
+@Table(name = "zz_area_code")
 public class AreaCode {
 
     /**
      * 行政区划主键Id
      */
-    @TableId(value = "area_id")
+    @Id
+    @Column(name = "area_id")
     private Long areaId;
 
     /**
      * 行政区划名称
      */
-    @TableField(value = "area_name")
+    @Column(name = "area_name")
     private String areaName;
 
     /**
      * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
      */
-    @TableField(value = "area_level")
+    @Column(name = "area_level")
     private Integer areaLevel;
 
     /**
      * 父级行政区划Id
      */
-    @TableField(value = "parent_id")
+    @Column(name = "parent_id")
     private Long parentId;
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * ClassCourse实体对象。
@@ -10,24 +10,26 @@ import lombok.Data;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_class_course")
+@Table(name = "zz_class_course")
 public class ClassCourse {
 
     /**
      * 班级Id。
      */
-    @TableField(value = "class_id")
+    @Id
+    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 课程Id。
      */
-    @TableField(value = "course_id")
+    @Id
+    @Column(name = "course_id")
     private Long courseId;
 
     /**
      * 课程顺序(数值越小越靠前)。
      */
-    @TableField(value = "course_order")
+    @Column(name = "course_order")
     private Integer courseOrder;
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * ClassStudent实体对象。
@@ -10,18 +10,20 @@ import lombok.Data;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_class_student")
+@Table(name = "zz_class_student")
 public class ClassStudent {
 
     /**
      * 班级Id。
      */
-    @TableField(value = "class_id")
+    @Id
+    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 学生Id。
      */
-    @TableField(value = "student_id")
+    @Id
+    @Column(name = "student_id")
     private Long studentId;
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java

@@ -1,6 +1,5 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.CourseVo;
 import com.orange.demo.courseclassapi.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
@@ -12,6 +11,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -24,19 +24,20 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_course")
+@Table(name = "zz_course")
 public class Course {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "course_id")
+    @Id
+    @Column(name = "course_id")
     private Long courseId;
 
     /**
      * 课程名称。
      */
-    @TableField(value = "course_name")
+    @Column(name = "course_name")
     private String courseName;
 
     /**
@@ -57,86 +58,86 @@ public class Course {
     /**
      * 年级Id。
      */
-    @TableField(value = "grade_id")
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 学科Id。
      */
-    @TableField(value = "subject_id")
+    @Column(name = "subject_id")
     private Integer subjectId;
 
     /**
      * 课时数量。
      */
-    @TableField(value = "class_hour")
+    @Column(name = "class_hour")
     private Integer classHour;
 
     /**
      * 多张课程图片地址。
      */
     @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
-    @TableField(value = "picture_url")
+    @Column(name = "picture_url")
     private String pictureUrl;
 
     /**
      * 创建用户Id。
      */
-    @TableField(value = "create_user_id")
+    @Column(name = "create_user_id")
     private Long createUserId;
 
     /**
      * 创建时间。
      */
-    @TableField(value = "create_time")
+    @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 最后修改时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * price 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private BigDecimal priceStart;
 
     /**
      * price 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private BigDecimal priceEnd;
 
     /**
      * classHour 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private Integer classHourStart;
 
     /**
      * classHour 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private Integer classHourEnd;
 
     /**
      * updateTime 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String updateTimeStart;
 
     /**
      * updateTime 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String updateTimeEnd;
 
     /**
      * courseId 的多对多关联表数据对象。
      */
-    @TableField(exist = false)
+    @Transient
     private ClassCourse classCourse;
 
     @RelationDict(
@@ -145,19 +146,19 @@ public class Course {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> gradeIdDictMap;
 
     @RelationConstDict(
             masterIdField = "difficulty",
             constantDictClass = CourseDifficult.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> difficultyDictMap;
 
     @RelationConstDict(
             masterIdField = "subjectId",
             constantDictClass = Subject.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> subjectIdDictMap;
 
     @Mapper

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java

@@ -1,7 +1,8 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * Grade实体对象。
@@ -10,24 +11,26 @@ import lombok.Data;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_grade")
+@Table(name = "zz_grade")
 public class Grade {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "grade_id", type = IdType.AUTO)
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 年级名称。
      */
-    @TableField(value = "grade_name")
+    @Column(name = "grade_name")
     private String gradeName;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
+    @DeletedFlagColumn
     private Integer status;
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java

@@ -1,7 +1,7 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * MaterialEdition实体对象。
@@ -10,19 +10,21 @@ import lombok.Data;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_material_edition")
+@Table(name = "zz_material_edition")
 public class MaterialEdition {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "edition_id", type = IdType.AUTO)
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "edition_id")
     private Integer editionId;
 
     /**
      * 教材版本名称。
      */
-    @TableField(value = "edition_name")
+    @Column(name = "edition_name")
     private String editionName;
 
     /**

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java

@@ -1,12 +1,12 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Map;
 
@@ -17,31 +17,32 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_school_info")
+@Table(name = "zz_school_info")
 public class SchoolInfo {
 
     /**
      * 学校Id。
      */
-    @TableId(value = "school_id")
+    @Id
+    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 学校名称。
      */
-    @TableField(value = "school_name")
+    @Column(name = "school_name")
     private String schoolName;
 
     /**
      * 所在省Id。
      */
-    @TableField(value = "province_id")
+    @Column(name = "province_id")
     private Long provinceId;
 
     /**
      * 所在城市Id。
      */
-    @TableField(value = "city_id")
+    @Column(name = "city_id")
     private Long cityId;
 
     @RelationDict(
@@ -50,7 +51,7 @@ public class SchoolInfo {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -59,7 +60,7 @@ public class SchoolInfo {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> cityIdDictMap;
 
     @Mapper

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java

@@ -1,6 +1,5 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.StudentVo;
 import com.orange.demo.application.common.constant.Gender;
 import com.orange.demo.application.common.constant.ExpLevel;
@@ -12,6 +11,7 @@ import com.orange.demo.common.core.util.MyCommonUtil;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -23,43 +23,44 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_student")
+@Table(name = "zz_student")
 public class Student {
 
     /**
      * 学生Id。
      */
-    @TableId(value = "student_id")
+    @Id
+    @Column(name = "student_id")
     private Long studentId;
 
     /**
      * 登录手机。
      */
-    @TableField(value = "login_mobile")
+    @Column(name = "login_mobile")
     private String loginMobile;
 
     /**
      * 学生姓名。
      */
-    @TableField(value = "student_name")
+    @Column(name = "student_name")
     private String studentName;
 
     /**
      * 所在省份Id。
      */
-    @TableField(value = "province_id")
+    @Column(name = "province_id")
     private Long provinceId;
 
     /**
      * 所在城市Id。
      */
-    @TableField(value = "city_id")
+    @Column(name = "city_id")
     private Long cityId;
 
     /**
      * 区县Id。
      */
-    @TableField(value = "district_id")
+    @Column(name = "district_id")
     private Long districtId;
 
     /**
@@ -75,37 +76,37 @@ public class Student {
     /**
      * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
      */
-    @TableField(value = "experience_level")
+    @Column(name = "experience_level")
     private Integer experienceLevel;
 
     /**
      * 总共充值学币数量。
      */
-    @TableField(value = "total_coin")
+    @Column(name = "total_coin")
     private Integer totalCoin;
 
     /**
      * 可用学币数量。
      */
-    @TableField(value = "left_coin")
+    @Column(name = "left_coin")
     private Integer leftCoin;
 
     /**
      * 年级Id。
      */
-    @TableField(value = "grade_id")
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 校区Id。
      */
-    @TableField(value = "school_id")
+    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 注册时间。
      */
-    @TableField(value = "register_time")
+    @Column(name = "register_time")
     private Date registerTime;
 
     /**
@@ -116,31 +117,31 @@ public class Student {
     /**
      * birthday 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String birthdayStart;
 
     /**
      * birthday 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String birthdayEnd;
 
     /**
      * registerTime 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String registerTimeStart;
 
     /**
      * registerTime 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String registerTimeEnd;
 
     /**
      * true LIKE搜索字符串。
      */
-    @TableField(exist = false)
+    @Transient
     private String searchString;
 
     public void setSearchString(String searchString) {
@@ -153,7 +154,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -162,7 +163,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> cityIdDictMap;
 
     @RelationDict(
@@ -171,7 +172,7 @@ public class Student {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> districtIdDictMap;
 
     @RelationDict(
@@ -180,7 +181,7 @@ public class Student {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> gradeIdDictMap;
 
     @RelationDict(
@@ -189,25 +190,25 @@ public class Student {
             slaveModelClass = SchoolInfo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> schoolIdDictMap;
 
     @RelationConstDict(
             masterIdField = "gender",
             constantDictClass = Gender.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> genderDictMap;
 
     @RelationConstDict(
             masterIdField = "experienceLevel",
             constantDictClass = ExpLevel.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> experienceLevelDictMap;
 
     @RelationConstDict(
             masterIdField = "status",
             constantDictClass = StudentStatus.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> statusDictMap;
 
     @Mapper

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java

@@ -1,14 +1,15 @@
 package com.orange.demo.courseclassservice.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.courseclassapi.vo.StudentClassVo;
 import com.orange.demo.courseclassapi.constant.ClassLevel;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -20,61 +21,62 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
-@TableName(value = "zz_class")
+@Table(name = "zz_class")
 public class StudentClass {
 
     /**
      * 班级Id。
      */
-    @TableId(value = "class_id")
+    @Id
+    @Column(name = "class_id")
     private Long classId;
 
     /**
      * 班级名称。
      */
-    @TableField(value = "class_name")
+    @Column(name = "class_name")
     private String className;
 
     /**
      * 学校Id。
      */
-    @TableField(value = "school_id")
+    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 学生班长Id。
      */
-    @TableField(value = "leader_id")
+    @Column(name = "leader_id")
     private Long leaderId;
 
     /**
      * 已完成课时数量。
      */
-    @TableField(value = "finish_class_hour")
+    @Column(name = "finish_class_hour")
     private Integer finishClassHour;
 
     /**
      * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
      */
-    @TableField(value = "class_level")
+    @Column(name = "class_level")
     private Integer classLevel;
 
     /**
      * 创建用户。
      */
-    @TableField(value = "create_user_id")
+    @Column(name = "create_user_id")
     private Long createUserId;
 
     /**
      * 班级创建时间。
      */
-    @TableField(value = "create_time")
+    @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
+    @DeletedFlagColumn
     private Integer status;
 
     @RelationDict(
@@ -83,7 +85,7 @@ public class StudentClass {
             slaveModelClass = SchoolInfo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> schoolIdDictMap;
 
     @RelationDict(
@@ -92,13 +94,13 @@ public class StudentClass {
             slaveModelClass = Student.class,
             slaveIdField = "studentId",
             slaveNameField = "studentName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> leaderIdDictMap;
 
     @RelationConstDict(
             masterIdField = "classLevel",
             constantDictClass = ClassLevel.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> classLevelDictMap;
 
     @Mapper

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/CourseServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.courseclassservice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -82,8 +80,7 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
         course.setCreateTime(originalCourse.getCreateTime());
         course.setUpdateTime(new Date());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<Course> uw = this.createUpdateQueryForNullValue(course, course.getCourseId());
-        return courseMapper.update(course, uw) == 1;
+        return courseMapper.updateByPrimaryKey(course) == 1;
     }
 
     /**
@@ -95,13 +92,14 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long courseId) {
-        if (courseMapper.deleteById(courseId) == 0) {
+        // 这里先删除主数据
+        if (!this.removeById(courseId)) {
             return false;
         }
         // 开始删除与本地多对多父表的关联
         ClassCourse classCourse = new ClassCourse();
         classCourse.setCourseId(courseId);
-        classCourseMapper.delete(new QueryWrapper<>(classCourse));
+        classCourseMapper.delete(classCourse);
         return true;
     }
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/SchoolInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.orange.demo.courseclassservice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -70,8 +69,7 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Override
     public boolean update(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo) {
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<SchoolInfo> uw = this.createUpdateQueryForNullValue(schoolInfo, schoolInfo.getSchoolId());
-        return schoolInfoMapper.update(schoolInfo, uw) == 1;
+        return schoolInfoMapper.updateByPrimaryKey(schoolInfo) == 1;
     }
 
     /**
@@ -83,7 +81,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long schoolId) {
-        return schoolInfoMapper.deleteById(schoolId) == 1;
+        // 这里先删除主数据
+        return this.removeById(schoolId);
     }
 
     /**

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentClassServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.courseclassservice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
 import com.orange.demo.courseclassservice.model.*;
@@ -18,6 +16,7 @@ import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -84,9 +83,9 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     public boolean update(StudentClass studentClass, StudentClass originalStudentClass) {
         studentClass.setCreateUserId(originalStudentClass.getCreateUserId());
         studentClass.setCreateTime(originalStudentClass.getCreateTime());
+        studentClass.setStatus(GlobalDeletedFlag.NORMAL);
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<StudentClass> uw = this.createUpdateQueryForNullValue(studentClass, studentClass.getClassId());
-        return studentClassMapper.update(studentClass, uw) == 1;
+        return studentClassMapper.updateByPrimaryKey(studentClass) == 1;
     }
 
     /**
@@ -98,16 +97,17 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long classId) {
-        if (studentClassMapper.deleteById(classId) == 0) {
+        // 这里先删除主数据
+        if (!this.removeById(classId)) {
             return false;
         }
         // 开始删除多对多中间表的关联
         ClassCourse classCourse = new ClassCourse();
         classCourse.setClassId(classId);
-        classCourseMapper.delete(new QueryWrapper<>(classCourse));
+        classCourseMapper.delete(classCourse);
         ClassStudent classStudent = new ClassStudent();
         classStudent.setClassId(classId);
-        classStudentMapper.delete(new QueryWrapper<>(classStudent));
+        classStudentMapper.delete(classStudent);
         return true;
     }
 
@@ -197,8 +197,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         for (ClassCourse classCourse : classCourseList) {
             classCourse.setClassId(classId);
             MyModelUtil.setDefaultValue(classCourse, "courseOrder", 0);
-            classCourseMapper.insert(classCourse);
         }
+        classCourseMapper.insertList(classCourseList);
     }
 
     /**
@@ -210,13 +210,11 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateClassCourse(ClassCourse classCourse) {
-        ClassCourse filter = new ClassCourse();
-        filter.setClassId(classCourse.getClassId());
-        filter.setCourseId(classCourse.getCourseId());
-        UpdateWrapper<ClassCourse> uw =
-                BaseService.createUpdateQueryForNullValue(classCourse, ClassCourse.class);
-        uw.setEntity(filter);
-        return classCourseMapper.update(classCourse, uw) > 0;
+        Example e = new Example(ClassCourse.class);
+        e.createCriteria()
+                .andEqualTo("classId", classCourse.getClassId())
+                .andEqualTo("courseId", classCourse.getCourseId());
+        return classCourseMapper.updateByExample(classCourse, e) > 0;
     }
 
     /**
@@ -228,10 +226,11 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
      */
     @Override
     public ClassCourse getClassCourse(Long classId, Long courseId) {
-        ClassCourse filter = new ClassCourse();
-        filter.setClassId(classId);
-        filter.setCourseId(courseId);
-        return classCourseMapper.selectOne(new QueryWrapper<>(filter));
+        Example e = new Example(ClassCourse.class);
+        e.createCriteria()
+                .andEqualTo("classId", classId)
+                .andEqualTo("courseId", courseId);
+        return classCourseMapper.selectOneByExample(e);
     }
 
     /**
@@ -247,7 +246,7 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         ClassCourse filter = new ClassCourse();
         filter.setClassId(classId);
         filter.setCourseId(courseId);
-        return classCourseMapper.delete(new QueryWrapper<>(filter)) > 0;
+        return classCourseMapper.delete(filter) > 0;
     }
 
     /**
@@ -261,8 +260,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     public void addClassStudentList(List<ClassStudent> classStudentList, Long classId) {
         for (ClassStudent classStudent : classStudentList) {
             classStudent.setClassId(classId);
-            classStudentMapper.insert(classStudent);
         }
+        classStudentMapper.insertList(classStudentList);
     }
 
     /**
@@ -278,7 +277,7 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
         ClassStudent filter = new ClassStudent();
         filter.setClassId(classId);
         filter.setStudentId(studentId);
-        return classStudentMapper.delete(new QueryWrapper<>(filter)) > 0;
+        return classStudentMapper.delete(filter) > 0;
     }
 
     /**

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.courseclassservice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.application.common.constant.StudentStatus;
 import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassservice.dao.*;
@@ -81,8 +79,7 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public boolean update(Student student, Student originalStudent) {
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<Student> uw = this.createUpdateQueryForNullValue(student, student.getStudentId());
-        return studentMapper.update(student, uw) == 1;
+        return studentMapper.updateByPrimaryKey(student) == 1;
     }
 
     /**
@@ -94,13 +91,14 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long studentId) {
-        if (studentMapper.deleteById(studentId) == 0) {
+        // 这里先删除主数据
+        if (!this.removeById(studentId)) {
             return false;
         }
         // 开始删除与本地多对多父表的关联
         ClassStudent classStudent = new ClassStudent();
         classStudent.setStudentId(studentId);
-        classStudentMapper.delete(new QueryWrapper<>(classStudent));
+        classStudentMapper.delete(classStudent);
         return true;
     }