同步1.9.0

orange-demo-single-service/application-webadmin/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>common-redis</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-sequence</artifactId>

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/AreaCode.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 行政区划实体对象。
  *
@@ -10,30 +11,31 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassCourse.java

@@ -1,7 +1,7 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * ClassCourse实体对象。
@@ -10,24 +10,26 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassStudent.java

@@ -1,7 +1,7 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * ClassStudent实体对象。
@@ -10,18 +10,20 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Course.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.webadmin.app.model.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
 import com.orange.demo.common.core.upload.UploadStoreTypeEnum;
@@ -12,6 +11,7 @@ import com.orange.demo.webadmin.app.vo.CourseVo;
 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-09-24
  */
 @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;
 
     /**
      * createTime 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeEnd;
 
     /**
      * 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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/CourseTransStats.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.application.common.constant.Subject;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.annotation.RelationConstDict;
@@ -9,6 +8,7 @@ import com.orange.demo.webadmin.app.vo.CourseTransStatsVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -20,79 +20,81 @@ import java.util.Map;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_course_trans_stats")
+@Table(name = "zz_course_trans_stats")
 public class CourseTransStats {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "stats_id", type = IdType.AUTO)
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "stats_id")
     private Long statsId;
 
     /**
      * 统计日期。
      */
-    @TableField(value = "stats_date")
+    @Column(name = "stats_date")
     private Date statsDate;
 
     /**
      * 科目Id。
      */
-    @TableField(value = "subject_id")
+    @Column(name = "subject_id")
     private Integer subjectId;
 
     /**
      * 年级Id。
      */
-    @TableField(value = "grade_id")
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 年级名称。
      */
-    @TableField(value = "grade_name")
+    @Column(name = "grade_name")
     private String gradeName;
 
     /**
      * 课程Id。
      */
-    @TableField(value = "course_id")
+    @Column(name = "course_id")
     private Long courseId;
 
     /**
      * 课程名称。
      */
-    @TableField(value = "course_name")
+    @Column(name = "course_name")
     private String courseName;
 
     /**
      * 学生上课次数。
      */
-    @TableField(value = "student_attend_count")
+    @Column(name = "student_attend_count")
     private Integer studentAttendCount;
 
     /**
      * 学生献花数量。
      */
-    @TableField(value = "student_flower_amount")
+    @Column(name = "student_flower_amount")
     private Integer studentFlowerAmount;
 
     /**
      * 学生献花次数。
      */
-    @TableField(value = "student_flower_count")
+    @Column(name = "student_flower_count")
     private Integer studentFlowerCount;
 
     /**
      * statsDate 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String statsDateStart;
 
     /**
      * statsDate 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String statsDateEnd;
 
     @RelationDict(
@@ -101,13 +103,13 @@ public class CourseTransStats {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> gradeIdDictMap;
 
     @RelationConstDict(
             masterIdField = "subjectId",
             constantDictClass = Subject.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> subjectIdDictMap;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Grade.java

@@ -1,7 +1,8 @@
 package com.orange.demo.webadmin.app.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-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/MaterialEdition.java

@@ -1,7 +1,7 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import javax.persistence.*;
 
 /**
  * MaterialEdition实体对象。
@@ -10,19 +10,21 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/SchoolInfo.java

@@ -1,12 +1,12 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.webadmin.app.vo.SchoolInfoVo;
 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-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Student.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.application.common.constant.Gender;
 import com.orange.demo.application.common.constant.ExpLevel;
 import com.orange.demo.application.common.constant.StudentStatus;
@@ -12,6 +11,7 @@ import com.orange.demo.webadmin.app.vo.StudentVo;
 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-09-24
  */
 @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;
 
     /**
      * login_mobile / student_name 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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionStats.java

@@ -1,12 +1,12 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.webadmin.app.vo.StudentActionStatsVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -18,145 +18,146 @@ import java.util.Map;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_student_action_stats")
+@Table(name = "zz_student_action_stats")
 public class StudentActionStats {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "stats_id")
+    @Id
+    @Column(name = "stats_id")
     private Long statsId;
 
     /**
      * 统计日期。
      */
-    @TableField(value = "stats_date")
+    @Column(name = "stats_date")
     private Date statsDate;
 
     /**
      * 统计小时。
      */
-    @TableField(value = "stats_month")
+    @Column(name = "stats_month")
     private Date statsMonth;
 
     /**
      * 年级Id。
      */
-    @TableField(value = "grade_id")
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 学生所在省Id。
      */
-    @TableField(value = "province_id")
+    @Column(name = "province_id")
     private Long provinceId;
 
     /**
      * 学生所在城市Id。
      */
-    @TableField(value = "city_id")
+    @Column(name = "city_id")
     private Long cityId;
 
     /**
      * 购课学币数量。
      */
-    @TableField(value = "buy_course_amount")
+    @Column(name = "buy_course_amount")
     private Integer buyCourseAmount;
 
     /**
      * 购买课程次数。
      */
-    @TableField(value = "buy_course_count")
+    @Column(name = "buy_course_count")
     private Integer buyCourseCount;
 
     /**
      * 购买视频学币数量。
      */
-    @TableField(value = "buy_video_amount")
+    @Column(name = "buy_video_amount")
     private Integer buyVideoAmount;
 
     /**
      * 购买视频次数。
      */
-    @TableField(value = "buy_video_count")
+    @Column(name = "buy_video_count")
     private Integer buyVideoCount;
 
     /**
      * 购买作业学币数量。
      */
-    @TableField(value = "buy_paper_amount")
+    @Column(name = "buy_paper_amount")
     private Integer buyPaperAmount;
 
     /**
      * 购买作业次数。
      */
-    @TableField(value = "buy_paper_count")
+    @Column(name = "buy_paper_count")
     private Integer buyPaperCount;
 
     /**
      * 购买献花数量。
      */
-    @TableField(value = "buy_flower_amount")
+    @Column(name = "buy_flower_amount")
     private Integer buyFlowerAmount;
 
     /**
      * 购买献花次数。
      */
-    @TableField(value = "buy_flower_count")
+    @Column(name = "buy_flower_count")
     private Integer buyFlowerCount;
 
     /**
      * 充值学币数量。
      */
-    @TableField(value = "recharge_coin_amount")
+    @Column(name = "recharge_coin_amount")
     private Integer rechargeCoinAmount;
 
     /**
      * 充值学币次数。
      */
-    @TableField(value = "recharge_coin_count")
+    @Column(name = "recharge_coin_count")
     private Integer rechargeCoinCount;
 
     /**
      * 线下课程上课次数。
      */
-    @TableField(value = "do_course_count")
+    @Column(name = "do_course_count")
     private Integer doCourseCount;
 
     /**
      * 观看视频次数。
      */
-    @TableField(value = "watch_video_count")
+    @Column(name = "watch_video_count")
     private Integer watchVideoCount;
 
     /**
      * 购买献花消费学币数量。
      */
-    @TableField(value = "watch_video_total_second")
+    @Column(name = "watch_video_total_second")
     private Integer watchVideoTotalSecond;
 
     /**
      * 做题数量。
      */
-    @TableField(value = "do_exercise_count")
+    @Column(name = "do_exercise_count")
     private Integer doExerciseCount;
 
     /**
      * 做题正确的数量。
      */
-    @TableField(value = "do_exercise_correct_count")
+    @Column(name = "do_exercise_correct_count")
     private Integer doExerciseCorrectCount;
 
     /**
      * statsDate 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String statsDateStart;
 
     /**
      * statsDate 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String statsDateEnd;
 
     @RelationDict(
@@ -165,7 +166,7 @@ public class StudentActionStats {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> gradeIdDictMap;
 
     @RelationDict(
@@ -174,7 +175,7 @@ public class StudentActionStats {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> provinceIdDictMap;
 
     @RelationDict(
@@ -183,7 +184,7 @@ public class StudentActionStats {
             slaveModelClass = AreaCode.class,
             slaveIdField = "areaId",
             slaveNameField = "areaName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> cityIdDictMap;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionTrans.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.application.common.constant.StudentActionType;
 import com.orange.demo.application.common.constant.DeviceType;
 import com.orange.demo.common.core.annotation.RelationDict;
@@ -10,6 +9,7 @@ import com.orange.demo.webadmin.app.vo.StudentActionTransVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -21,109 +21,110 @@ import java.util.Map;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_student_action_trans")
+@Table(name = "zz_student_action_trans")
 public class StudentActionTrans {
 
     /**
      * 主键Id。
      */
-    @TableId(value = "trans_id")
+    @Id
+    @Column(name = "trans_id")
     private Long transId;
 
     /**
      * 学生Id。
      */
-    @TableField(value = "student_id")
+    @Column(name = "student_id")
     private Long studentId;
 
     /**
      * 学生名称。
      */
-    @TableField(value = "student_name")
+    @Column(name = "student_name")
     private String studentName;
 
     /**
      * 学生校区。
      */
-    @TableField(value = "school_id")
+    @Column(name = "school_id")
     private Long schoolId;
 
     /**
      * 年级Id。
      */
-    @TableField(value = "grade_id")
+    @Column(name = "grade_id")
     private Integer gradeId;
 
     /**
      * 行为类型(0: 充值  1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
      */
-    @TableField(value = "action_type")
+    @Column(name = "action_type")
     private Integer actionType;
 
     /**
      * 设备类型(0: iOS 1: Android 2: PC)。
      */
-    @TableField(value = "device_type")
+    @Column(name = "device_type")
     private Integer deviceType;
 
     /**
      * 看视频秒数。
      */
-    @TableField(value = "watch_video_seconds")
+    @Column(name = "watch_video_seconds")
     private Integer watchVideoSeconds;
 
     /**
      * 购买献花数量。
      */
-    @TableField(value = "flower_count")
+    @Column(name = "flower_count")
     private Integer flowerCount;
 
     /**
      * 购买作业数量。
      */
-    @TableField(value = "paper_count")
+    @Column(name = "paper_count")
     private Integer paperCount;
 
     /**
      * 购买视频数量。
      */
-    @TableField(value = "video_count")
+    @Column(name = "video_count")
     private Integer videoCount;
 
     /**
      * 购买课程数量。
      */
-    @TableField(value = "course_count")
+    @Column(name = "course_count")
     private Integer courseCount;
 
     /**
      * 充值学币数量。
      */
-    @TableField(value = "coin_count")
+    @Column(name = "coin_count")
     private Integer coinCount;
 
     /**
      * 做题是否正确标记。
      */
-    @TableField(value = "exercise_correct_flag")
+    @Column(name = "exercise_correct_flag")
     private Integer exerciseCorrectFlag;
 
     /**
      * 发生时间。
      */
-    @TableField(value = "create_time")
+    @Column(name = "create_time")
     private Date createTime;
 
     /**
      * createTime 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeEnd;
 
     @RelationDict(
@@ -132,7 +133,7 @@ public class StudentActionTrans {
             slaveModelClass = SchoolInfo.class,
             slaveIdField = "schoolId",
             slaveNameField = "schoolName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> schoolIdDictMap;
 
     @RelationDict(
@@ -141,19 +142,19 @@ public class StudentActionTrans {
             slaveModelClass = Grade.class,
             slaveIdField = "gradeId",
             slaveNameField = "gradeName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> gradeIdDictMap;
 
     @RelationConstDict(
             masterIdField = "actionType",
             constantDictClass = StudentActionType.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> actionTypeDictMap;
 
     @RelationConstDict(
             masterIdField = "deviceType",
             constantDictClass = DeviceType.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> deviceTypeDictMap;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentClass.java

@@ -1,14 +1,15 @@
 package com.orange.demo.webadmin.app.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.webadmin.app.model.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 com.orange.demo.webadmin.app.vo.StudentClassVo;
 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-09-24
  */
 @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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.webadmin.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.webadmin.app.service.*;
 import com.orange.demo.webadmin.app.dao.*;
 import com.orange.demo.webadmin.app.model.*;
@@ -81,8 +79,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;
     }
 
     /**
@@ -94,13 +91,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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/SchoolInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.webadmin.app.service.*;
 import com.orange.demo.webadmin.app.dao.*;
 import com.orange.demo.webadmin.app.model.*;
@@ -69,8 +68,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;
     }
 
     /**
@@ -82,7 +80,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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionTransServiceImpl.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.webadmin.app.service.*;
 import com.orange.demo.webadmin.app.dao.*;
 import com.orange.demo.webadmin.app.model.*;
@@ -71,8 +70,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Override
     public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<StudentActionTrans> uw = this.createUpdateQueryForNullValue(studentActionTrans, studentActionTrans.getTransId());
-        return studentActionTransMapper.update(studentActionTrans, uw) == 1;
+        return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
     }
 
     /**
@@ -84,7 +82,8 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long transId) {
-        return studentActionTransMapper.deleteById(transId) == 1;
+        // 这里先删除主数据
+        return this.removeById(transId);
     }
 
     /**

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentClassServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.webadmin.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.webadmin.app.service.*;
 import com.orange.demo.webadmin.app.dao.*;
 import com.orange.demo.webadmin.app.model.*;
@@ -18,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -85,9 +84,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;
     }
 
     /**
@@ -99,16 +98,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;
     }
 
@@ -156,8 +156,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);
     }
 
     /**
@@ -169,13 +169,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;
     }
 
     /**
@@ -187,10 +185,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);
     }
 
     /**
@@ -206,7 +205,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;
     }
 
     /**
@@ -220,8 +219,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);
     }
 
     /**
@@ -237,7 +236,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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.webadmin.app.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.webadmin.app.service.*;
 import com.orange.demo.webadmin.app.dao.*;
@@ -83,8 +81,7 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     public boolean update(Student student, Student originalStudent) {
         student.setRegisterTime(originalStudent.getRegisterTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<Student> uw = this.createUpdateQueryForNullValue(student, student.getStudentId());
-        return studentMapper.update(student, uw) == 1;
+        return studentMapper.updateByPrimaryKey(student) == 1;
     }
 
     /**
@@ -96,13 +93,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;
     }
 

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/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-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginController.java

@@ -10,8 +10,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import lombok.extern.slf4j.Slf4j;
 import com.orange.demo.webadmin.config.ApplicationConfig;
 import com.orange.demo.webadmin.upms.service.*;
-import com.orange.demo.webadmin.upms.model.SysMenu;
-import com.orange.demo.webadmin.upms.model.SysUser;
+import com.orange.demo.webadmin.upms.model.*;
 import com.orange.demo.webadmin.upms.model.constant.SysUserStatus;
 import com.orange.demo.webadmin.upms.model.constant.SysUserType;
 import com.orange.demo.common.core.annotation.NoAuthInterface;
@@ -175,9 +174,10 @@ public class LoginController {
     }
 
     private JSONObject buildLoginData(SysUser user) {
+        int deviceType = MyCommonUtil.getDeviceType();
         boolean isAdmin = user.getUserType() == SysUserType.TYPE_ADMIN;
         Map<String, Object> claims = new HashMap<>(3);
-        String sessionId = user.getLoginName() + "_" + MyCommonUtil.generateUuid();
+        String sessionId = user.getLoginName() + "_" + deviceType + "_" + MyCommonUtil.generateUuid();
         claims.put("sessionId", sessionId);
         String token = JwtUtil.generateToken(claims, appConfig.getExpiration(), appConfig.getTokenSigningKey());
         JSONObject jsonData = new JSONObject();
@@ -192,6 +192,7 @@ public class LoginController {
         tokenData.setIsAdmin(isAdmin);
         tokenData.setLoginIp(IpUtil.getRemoteIpAddress(ContextUtil.getHttpRequest()));
         tokenData.setLoginTime(new Date());
+        tokenData.setDeviceType(deviceType);
         String sessionIdKey = RedisKeyUtil.makeSessionIdKey(sessionId);
         String sessionData = JSON.toJSONString(tokenData, SerializerFeature.WriteNonStringValueAsString);
         RBucket<String> bucket = redissonClient.getBucket(sessionIdKey);

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysUserController.java

@@ -1,5 +1,6 @@
 package com.orange.demo.webadmin.upms.controller;
 
+import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.webadmin.upms.vo.*;
 import com.orange.demo.webadmin.upms.dto.*;
@@ -48,7 +49,6 @@ public class SysUserController {
      * @param roleIdListString 逗号分隔的角色Id列表。
      * @return 应答结果对象，包含新增用户的主键Id。
      */
-    @SuppressWarnings("unchecked")
     @ApiOperationSupport(ignoreParameters = {
             "sysUserDto.userId",
             "sysUserDto.createTimeStart",
@@ -61,11 +61,12 @@ public class SysUserController {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
         }
         SysUser sysUser = MyModelUtil.copyTo(sysUserDto, SysUser.class);
-        CallResult result = sysUserService.verifyRelatedData(sysUser, null, roleIdListString);
+        CallResult result = sysUserService.verifyRelatedData(
+                sysUser, null, roleIdListString);
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> roleIdSet = (Set<Long>) result.getData().get("roleIdSet");
+        Set<Long> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {});
         sysUserService.saveNew(sysUser, roleIdSet);
         return ResponseResult.success(sysUser.getUserId());
     }
@@ -77,7 +78,6 @@ public class SysUserController {
      * @param roleIdListString 逗号分隔的角色Id列表。
      * @return 应答结果对象。
      */
-    @SuppressWarnings("unchecked")
     @ApiOperationSupport(ignoreParameters = {
             "sysUserDto.createTimeStart",
             "sysUserDto.createTimeEnd"})
@@ -93,11 +93,12 @@ public class SysUserController {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
         SysUser sysUser = MyModelUtil.copyTo(sysUserDto, SysUser.class);
-        CallResult result = sysUserService.verifyRelatedData(sysUser, originalUser, roleIdListString);
+        CallResult result = sysUserService.verifyRelatedData(
+                sysUser, originalUser, roleIdListString);
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> roleIdSet = (Set<Long>) result.getData().get("roleIdSet");
+        Set<Long> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {});
         if (!sysUserService.update(sysUser, originalUser, roleIdSet)) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenu.java

@@ -1,6 +1,6 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.webadmin.upms.vo.SysMenuVo;
@@ -9,6 +9,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
+import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -18,55 +19,56 @@ import java.util.*;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_menu")
+@Table(name = "zz_sys_menu")
 public class SysMenu {
 
     /**
      * 菜单Id。
      */
-    @TableId(value = "menu_id")
+    @Id
+    @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 父菜单Id，目录菜单的父菜单为null。
      */
-    @TableField(value = "parent_id")
+    @Column(name = "parent_id")
     private Long parentId;
 
     /**
      * 菜单显示名称。
      */
-    @TableField(value = "menu_name")
+    @Column(name = "menu_name")
     private String menuName;
 
     /**
      * 菜单类型(0: 目录 1: 菜单 2: 按钮 3: UI片段)。
      */
-    @TableField(value = "menu_type")
+    @Column(name = "menu_type")
     private Integer menuType;
 
     /**
      * 前端表单路由名称，仅用于menu_type为1的菜单类型。
      */
-    @TableField(value = "form_router_name")
+    @Column(name = "form_router_name")
     private String formRouterName;
 
     /**
      * 在线表单主键Id，仅用于在线表单绑定的菜单。
      */
-    @TableField(value = "online_form_id")
+    @Column(name = "online_form_id")
     private Long onlineFormId;
 
     /**
      * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
      */
-    @TableField(value = "online_menu_perm_type")
+    @Column(name = "online_menu_perm_type")
     private Integer onlineMenuPermType;
 
     /**
      * 菜单显示顺序 (值越小，排序越靠前)。
      */
-    @TableField(value = "show_order")
+    @Column(name = "show_order")
     private Integer showOrder;
 
     /**
@@ -77,39 +79,39 @@ public class SysMenu {
     /**
      * 创建者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;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysMenuPermCodeMapper",
             relationMasterIdField = "menuId",
             relationModelClass = SysMenuPermCode.class)
-    @TableField(exist = false)
+    @Transient
     private List<SysMenuPermCode> sysMenuPermCodeList;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenuPermCode.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 菜单与权限字关联实体对象。
  *
@@ -10,18 +11,20 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_menu_perm_code")
+@Table(name = "zz_sys_menu_perm_code")
 public class SysMenuPermCode {
 
     /**
      * 关联菜单Id。
      */
-    @TableField(value = "menu_id")
+    @Id
+    @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 关联权限字Id。
      */
-    @TableField(value = "perm_code_id")
+    @Id
+    @Column(name = "perm_code_id")
     private Long permCodeId;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPerm.java

@@ -1,9 +1,10 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationDict;
 import lombok.Data;
 
+import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -13,25 +14,26 @@ import java.util.*;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_perm")
+@Table(name = "zz_sys_perm")
 public class SysPerm {
 
     /**
      * 权限资源Id。
      */
-    @TableId(value = "perm_id")
+    @Id
+    @Column(name = "perm_id")
     private Long permId;
 
     /**
      * 权限所在的权限模块Id。
      */
-    @TableField(value = "module_id")
+    @Column(name = "module_id")
     private Long moduleId;
 
     /**
      * 权限名称。
      */
-    @TableField(value = "perm_name")
+    @Column(name = "perm_name")
     private String permName;
 
     /**
@@ -42,38 +44,38 @@ public class SysPerm {
     /**
      * 权限在当前模块下的顺序，由小到大。
      */
-    @TableField(value = "show_order")
+    @Column(name = "show_order")
     private Integer showOrder;
 
     /**
      * 创建者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;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationDict(
@@ -82,6 +84,6 @@ public class SysPerm {
             slaveModelClass = SysPermModule.class,
             slaveIdField = "moduleId",
             slaveNameField = "moduleName")
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> moduleIdDictMap;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCode.java

@@ -1,6 +1,6 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.webadmin.upms.vo.SysPermCodeVo;
@@ -9,6 +9,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
+import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -18,81 +19,82 @@ import java.util.*;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_perm_code")
+@Table(name = "zz_sys_perm_code")
 public class SysPermCode {
 
     /**
      * 权限字Id。
      */
-    @TableId(value = "perm_code_id")
+    @Id
+    @Column(name = "perm_code_id")
     private Long permCodeId;
 
     /**
      * 上级权限字Id。
      */
-    @TableField(value = "parent_id")
+    @Column(name = "parent_id")
     private Long parentId;
 
     /**
      * 权限字标识(一般为有含义的英文字符串)。
      */
-    @TableField(value = "perm_code")
+    @Column(name = "perm_code")
     private String permCode;
 
     /**
      * 权限类型(0: 表单 1: UI片段 2: 操作)。
      */
-    @TableField(value = "perm_code_type")
+    @Column(name = "perm_code_type")
     private Integer permCodeType;
 
     /**
      * 显示名称。
      */
-    @TableField(value = "show_name")
+    @Column(name = "show_name")
     private String showName;
 
     /**
      * 显示顺序(数值越小，越靠前)。
      */
-    @TableField(value = "show_order")
+    @Column(name = "show_order")
     private Integer showOrder;
 
     /**
      * 创建者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;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysPermCodePermMapper",
             relationMasterIdField = "permCodeId",
             relationModelClass = SysPermCodePerm.class)
-    @TableField(exist = false)
+    @Transient
     private List<SysPermCodePerm> sysPermCodePermList;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCodePerm.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 权限字与权限资源关联实体对象。
  *
@@ -10,18 +11,20 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_perm_code_perm")
+@Table(name = "zz_sys_perm_code_perm")
 public class SysPermCodePerm {
 
     /**
      * 权限字Id。
      */
-    @TableField(value = "perm_code_id")
+    @Id
+    @Column(name = "perm_code_id")
     private Long permCodeId;
 
     /**
      * 权限Id。
      */
-    @TableField(value = "perm_id")
+    @Id
+    @Column(name = "perm_id")
     private Long permId;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermModule.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import lombok.Data;
 
+import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -12,70 +13,71 @@ import java.util.*;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_perm_module")
+@Table(name = "zz_sys_perm_module")
 public class SysPermModule {
 
     /**
      * 权限模块Id。
      */
-    @TableId(value = "module_id")
+    @Id
+    @Column(name = "module_id")
     private Long moduleId;
 
     /**
      * 上级权限模块Id。
      */
-    @TableField(value = "parent_id")
+    @Column(name = "parent_id")
     private Long parentId;
 
     /**
      * 权限模块名称。
      */
-    @TableField(value = "module_name")
+    @Column(name = "module_name")
     private String moduleName;
 
     /**
      * 权限模块类型(0: 普通模块 1: Controller模块)。
      */
-    @TableField(value = "module_type")
+    @Column(name = "module_type")
     private Integer moduleType;
 
     /**
      * 权限模块在当前层级下的顺序，由小到大。
      */
-    @TableField(value = "show_order")
+    @Column(name = "show_order")
     private Integer showOrder;
 
     /**
      * 创建者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;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
-    @TableField(exist = false)
+    @Transient
     private List<SysPerm> sysPermList;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermWhitelist.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 白名单实体对象。
  *
@@ -10,24 +11,25 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_perm_whitelist")
+@Table(name = "zz_sys_perm_whitelist")
 public class SysPermWhitelist {
 
     /**
      * 权限资源的URL。
      */
-    @TableId(value = "perm_url")
+    @Id
+    @Column(name = "perm_url")
     private String permUrl;
 
     /**
      * 权限资源所属模块名字(通常是Controller的名字)。
      */
-    @TableField(value = "module_name")
+    @Column(name = "module_name")
     private String moduleName;
 
     /**
      * 权限的名称。
      */
-    @TableField(value = "perm_name")
+    @Column(name = "perm_name")
     private String permName;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRole.java

@@ -1,6 +1,6 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.webadmin.upms.vo.SysRoleVo;
@@ -9,6 +9,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
+import javax.persistence.*;
 import java.util.*;
 
 /**
@@ -18,57 +19,58 @@ import java.util.*;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_role")
+@Table(name = "zz_sys_role")
 public class SysRole {
 
     /**
      * 角色Id。
      */
-    @TableId(value = "role_id")
+    @Id
+    @Column(name = "role_id")
     private Long roleId;
 
     /**
      * 角色名称。
      */
-    @TableField(value = "role_name")
+    @Column(name = "role_name")
     private String roleName;
 
     /**
      * 创建者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;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
     @RelationManyToMany(
             relationMapperName = "sysRoleMenuMapper",
             relationMasterIdField = "roleId",
             relationModelClass = SysRoleMenu.class)
-    @TableField(exist = false)
+    @Transient
     private List<SysRoleMenu> sysRoleMenuList;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRoleMenu.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 角色菜单实体对象。
  *
@@ -10,18 +11,20 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_role_menu")
+@Table(name = "zz_sys_role_menu")
 public class SysRoleMenu {
 
     /**
      * 角色Id。
      */
-    @TableField(value = "role_id")
+    @Id
+    @Column(name = "role_id")
     private Long roleId;
 
     /**
      * 菜单Id。
      */
-    @TableField(value = "menu_id")
+    @Id
+    @Column(name = "menu_id")
     private Long menuId;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUser.java

@@ -1,15 +1,16 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.orange.demo.webadmin.upms.model.constant.SysUserType;
 import com.orange.demo.webadmin.upms.model.constant.SysUserStatus;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.webadmin.upms.vo.SysUserVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -22,19 +23,20 @@ import java.util.List;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_user")
+@Table(name = "zz_sys_user")
 public class SysUser {
 
     /**
      * 用户Id。
      */
-    @TableId(value = "user_id")
+    @Id
+    @Column(name = "user_id")
     private Long userId;
 
     /**
      * 登录用户名。
      */
-    @TableField(value = "login_name")
+    @Column(name = "login_name")
     private String loginName;
 
     /**
@@ -45,68 +47,68 @@ public class SysUser {
     /**
      * 用户显示名称。
      */
-    @TableField(value = "show_name")
+    @Column(name = "show_name")
     private String showName;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
      */
-    @TableField(value = "user_type")
+    @Column(name = "user_type")
     private Integer userType;
 
     /**
      * 用户头像的Url。
      */
-    @TableField(value = "head_image_url")
+    @Column(name = "head_image_url")
     private String headImageUrl;
 
     /**
      * 用户状态(0: 正常 1: 锁定)。
      */
-    @TableField(value = "user_status")
+    @Column(name = "user_status")
     private Integer userStatus;
 
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @TableLogic
-    @TableField(value = "deleted_flag")
+    @DeletedFlagColumn
+    @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
     /**
      * 创建用户Id。
      */
-    @TableField(value = "create_user_id")
+    @Column(name = "create_user_id")
     private Long createUserId;
 
     /**
      * 更新者Id。
      */
-    @TableField(value = "update_user_id")
+    @Column(name = "update_user_id")
     private Long updateUserId;
 
     /**
      * 创建时间。
      */
-    @TableField(value = "create_time")
+    @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 更新时间。
      */
-    @TableField(value = "update_time")
+    @Column(name = "update_time")
     private Date updateTime;
 
     /**
      * createTime 范围过滤起始值(>=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
-    @TableField(exist = false)
+    @Transient
     private String createTimeEnd;
 
     /**
@@ -116,19 +118,19 @@ public class SysUser {
             relationMapperName = "sysUserRoleMapper",
             relationMasterIdField = "userId",
             relationModelClass = SysUserRole.class)
-    @TableField(exist = false)
+    @Transient
     private List<SysUserRole> sysUserRoleList;
 
     @RelationConstDict(
             masterIdField = "userType",
             constantDictClass = SysUserType.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> userTypeDictMap;
 
     @RelationConstDict(
             masterIdField = "userStatus",
             constantDictClass = SysUserStatus.class)
-    @TableField(exist = false)
+    @Transient
     private Map<String, Object> userStatusDictMap;
 
     @Mapper

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUserRole.java

@@ -1,8 +1,9 @@
 package com.orange.demo.webadmin.upms.model;
 
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.persistence.*;
+
 /**
  * 用户角色实体对象。
  *
@@ -10,18 +11,20 @@ import lombok.Data;
  * @date 2020-09-24
  */
 @Data
-@TableName(value = "zz_sys_user_role")
+@Table(name = "zz_sys_user_role")
 public class SysUserRole {
 
     /**
      * 用户Id。
      */
-    @TableField(value = "user_id")
+    @Id
+    @Column(name = "user_id")
     private Long userId;
 
     /**
      * 角色Id。
      */
-    @TableField(value = "role_id")
+    @Id
+    @Column(name = "role_id")
     private Long roleId;
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysUserService.java

@@ -128,10 +128,10 @@ public interface SysUserService extends IBaseService<SysUser, Long> {
     /**
      * 验证用户对象关联的数据是否都合法。
      *
-     * @param sysUser          当前操作的对象。
-     * @param originalSysUser  原有对象。
-     * @param roleIdListString 逗号分隔的角色Id列表字符串。
+     * @param sysUser         当前操作的对象。
+     * @param originalSysUser 原有对象。
+     * @param roleIds         逗号分隔的角色Id列表字符串。
      * @return 验证结果。
      */
-    CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIdListString);
+    CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIds);
 }

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysMenuServiceImpl.java

@@ -2,9 +2,6 @@ package com.orange.demo.webadmin.upms.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -26,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 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.*;
 import java.util.stream.Collectors;
@@ -76,12 +74,14 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
         sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         sysMenuMapper.insert(sysMenu);
         if (permCodeIdSet != null) {
+            List<SysMenuPermCode> sysMenuPermCodeList = new LinkedList<>();
             for (Long permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
-                sysMenuPermCodeMapper.insert(menuPermCode);
+                sysMenuPermCodeList.add(menuPermCode);
             }
+            sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
         }
         // 判断当前菜单是否为指向在线表单的菜单，并将根据约定，动态插入两个子菜单。
         if (sysMenu.getOnlineFormId() != null) {
@@ -124,27 +124,30 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set<Long> permCodeIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
         sysMenu.setMenuType(originalSysMenu.getMenuType());
-        UpdateWrapper<SysMenu> uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
-        if (sysMenuMapper.update(sysMenu, uw) != 1) {
+        sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        if (sysMenuMapper.updateByPrimaryKey(sysMenu) != 1) {
             return false;
         }
         SysMenuPermCode deletedMenuPermCode = new SysMenuPermCode();
         deletedMenuPermCode.setMenuId(sysMenu.getMenuId());
-        sysMenuPermCodeMapper.delete(new QueryWrapper<>(deletedMenuPermCode));
+        sysMenuPermCodeMapper.delete(deletedMenuPermCode);
         if (permCodeIdSet != null) {
+            List<SysMenuPermCode> sysMenuPermCodeList = new LinkedList<>();
             for (Long permCodeId : permCodeIdSet) {
                 SysMenuPermCode menuPermCode = new SysMenuPermCode();
                 menuPermCode.setMenuId(sysMenu.getMenuId());
                 menuPermCode.setPermCodeId(permCodeId);
-                sysMenuPermCodeMapper.insert(menuPermCode);
+                sysMenuPermCodeList.add(menuPermCode);
             }
+            sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
         }
         // 如果当前菜单的在线表单Id变化了，就需要同步更新他的内置子菜单也同步更新。
         if (ObjectUtil.notEqual(originalSysMenu.getOnlineFormId(), sysMenu.getOnlineFormId())) {
             SysMenu onlineSubMenu = new SysMenu();
             onlineSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
-            sysMenuMapper.update(onlineSubMenu,
-                    new QueryWrapper<SysMenu>().lambda().eq(SysMenu::getParentId, sysMenu.getMenuId()));
+            Example e = new Example(SysMenu.class);
+            e.createCriteria().andEqualTo("parentId", sysMenu.getMenuId());
+            sysMenuMapper.updateByExampleSelective(onlineSubMenu, e);
         }
         return true;
     }
@@ -159,18 +162,23 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
     @Override
     public boolean remove(SysMenu menu) {
         Long menuId = menu.getMenuId();
-        if (sysMenuMapper.deleteById(menuId) != 1) {
+        if (!this.removeById(menuId)) {
             return false;
         }
         SysRoleMenu roleMenu = new SysRoleMenu();
         roleMenu.setMenuId(menuId);
-        sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
+        sysRoleMenuMapper.delete(roleMenu);
         SysMenuPermCode menuPermCode = new SysMenuPermCode();
         menuPermCode.setMenuId(menuId);
-        sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
+        sysMenuPermCodeMapper.delete(menuPermCode);
         // 如果为指向在线表单的菜单，则连同删除子菜单
         if (menu.getOnlineFormId() != null) {
-            sysMenuMapper.delete(new QueryWrapper<SysMenu>().lambda().eq(SysMenu::getParentId, menuId));
+            Example e = new Example(SysMenu.class);
+            Example.Criteria c = e.createCriteria().andEqualTo("parentId", menuId);
+            c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+            SysMenu deletedSubMenu = new SysMenu();
+            deletedSubMenu.setDeletedFlag(GlobalDeletedFlag.DELETED);
+            sysMenuMapper.updateByExampleSelective(deletedSubMenu, e);
         }
         return true;
     }
@@ -182,11 +190,12 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Override
     public Collection<SysMenu> getAllMenuList() {
-        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
-        queryWrapper.in(this.safeMapToColumnName("menuType"),
-                Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
-        return sysMenuMapper.selectList(queryWrapper);
+        Example e = new Example(SysMenu.class);
+        e.orderBy("showOrder");
+        Example.Criteria c = e.createCriteria();
+        c.andIn("menuType", Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
+        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+        return sysMenuMapper.selectByExample(e);
     }
 
     /**
@@ -285,12 +294,12 @@ public class SysMenuServiceImpl extends BaseService<SysMenu, Long> implements Sy
      */
     @Override
     public List<SysMenu> getAllOnlineMenuList(Integer menuType) {
-        LambdaQueryWrapper<SysMenu> queryWrapper =
-                new QueryWrapper<SysMenu>().lambda().isNotNull(SysMenu::getOnlineFormId);
+        Example e = new Example(SysMenu.class);
+        Example.Criteria c = e.createCriteria().andIsNotNull("onlineFormId");
         if (menuType != null) {
-            queryWrapper.eq(SysMenu::getMenuType, menuType);
+            c.andEqualTo("menuType", menuType);
         }
-        return sysMenuMapper.selectList(queryWrapper);
+        return sysMenuMapper.selectByExample(e);
     }
 
     /**

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermCodeServiceImpl.java

@@ -1,8 +1,6 @@
 package com.orange.demo.webadmin.upms.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -95,12 +93,14 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
         sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         sysPermCodeMapper.insert(sysPermCode);
         if (permIdSet != null) {
+            List<SysPermCodePerm> sysPermCodePermList = new LinkedList<>();
             for (Long permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
-                sysPermCodePermMapper.insert(permCodePerm);
+                sysPermCodePermList.add(permCodePerm);
             }
+            sysPermCodePermMapper.insertList(sysPermCodePermList);
         }
         return sysPermCode;
     }
@@ -118,21 +118,22 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
     public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set<Long> permIdSet) {
         MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
         sysPermCode.setParentId(originalSysPermCode.getParentId());
-        UpdateWrapper<SysPermCode> uw =
-                this.createUpdateQueryForNullValue(sysPermCode, sysPermCode.getPermCodeId());
-        if (sysPermCodeMapper.update(sysPermCode, uw) != 1) {
-                return false;
+        sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        if (sysPermCodeMapper.updateByPrimaryKey(sysPermCode) != 1) {
+            return false;
         }
         SysPermCodePerm deletedPermCodePerm = new SysPermCodePerm();
         deletedPermCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
-        sysPermCodePermMapper.delete(new QueryWrapper<>(deletedPermCodePerm));
+        sysPermCodePermMapper.delete(deletedPermCodePerm);
         if (permIdSet != null) {
+            List<SysPermCodePerm> sysPermCodePermList = new LinkedList<>();
             for (Long permId : permIdSet) {
                 SysPermCodePerm permCodePerm = new SysPermCodePerm();
                 permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
                 permCodePerm.setPermId(permId);
-                sysPermCodePermMapper.insert(permCodePerm);
+                sysPermCodePermList.add(permCodePerm);
             }
+            sysPermCodePermMapper.insertList(sysPermCodePermList);
         }
         return true;
     }
@@ -146,15 +147,15 @@ public class SysPermCodeServiceImpl extends BaseService<SysPermCode, Long> imple
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long permCodeId) {
-        if (sysPermCodeMapper.deleteById(permCodeId) != 1) {
+        if (!this.removeById(permCodeId)) {
             return false;
         }
         SysMenuPermCode menuPermCode = new SysMenuPermCode();
         menuPermCode.setPermCodeId(permCodeId);
-        sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
+        sysMenuPermCodeMapper.delete(menuPermCode);
         SysPermCodePerm permCodePerm = new SysPermCodePerm();
         permCodePerm.setPermCodeId(permCodeId);
-        sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
+        sysPermCodePermMapper.delete(permCodePerm);
         return true;
     }
 

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermModuleServiceImpl.java

@@ -71,7 +71,8 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
     @Override
     public boolean update(SysPermModule sysPermModule, SysPermModule originalSysPermModule) {
         MyModelUtil.fillCommonsForUpdate(sysPermModule, originalSysPermModule);
-        return sysPermModuleMapper.updateById(sysPermModule) != 0;
+        sysPermModule.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysPermModuleMapper.updateByPrimaryKey(sysPermModule) != 0;
     }
 
     /**
@@ -83,7 +84,7 @@ public class SysPermModuleServiceImpl extends BaseService<SysPermModule, Long> i
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long moduleId) {
-        return sysPermModuleMapper.deleteById(moduleId) == 1;
+        return this.removeById(moduleId);
     }
 
     /**

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermServiceImpl.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.upms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import cn.hutool.core.util.ObjectUtil;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
@@ -24,6 +23,7 @@ import org.redisson.api.RedissonClient;
 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.*;
 import java.util.concurrent.TimeUnit;
@@ -90,8 +90,9 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(SysPerm perm, SysPerm originalPerm) {
+        perm.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForUpdate(perm, originalPerm);
-        return sysPermMapper.updateById(perm) != 0;
+        return sysPermMapper.updateByPrimaryKeySelective(perm) != 0;
     }
 
     /**
@@ -103,12 +104,12 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long permId) {
-        if (sysPermMapper.deleteById(permId) != 1) {
+        if (!this.removeById(permId)) {
             return false;
         }
         SysPermCodePerm permCodePerm = new SysPermCodePerm();
         permCodePerm.setPermId(permId);
-        sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
+        sysPermCodePermMapper.delete(permCodePerm);
         return true;
     }
 
@@ -120,13 +121,17 @@ public class SysPermServiceImpl extends BaseService<SysPerm, Long> implements Sy
      */
     @Override
     public List<SysPerm> getPermListWithRelation(SysPerm sysPermFilter) {
-        QueryWrapper<SysPerm> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
-        queryWrapper.eq(ObjectUtil.isNotNull(sysPermFilter.getModuleId()),
-        this.safeMapToColumnName("moduleId"), sysPermFilter.getModuleId());
-        queryWrapper.like(ObjectUtil.isNotNull(sysPermFilter.getUrl()),
-        this.safeMapToColumnName("url"), "%" + sysPermFilter.getUrl() + "%");
-        List<SysPerm> permList = sysPermMapper.selectList(queryWrapper);
+        Example e = new Example(SysPerm.class);
+        e.orderBy("showOrder");
+        Example.Criteria c = e.createCriteria();
+        if (ObjectUtil.isNotNull(sysPermFilter.getModuleId())) {
+            c.andEqualTo("moduleId", sysPermFilter.getModuleId());
+        }
+        if (ObjectUtil.isNotNull(sysPermFilter.getUrl())) {
+            c.andLike("url", "%" + sysPermFilter.getUrl() + "%");
+        }
+        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+        List<SysPerm> permList = sysPermMapper.selectByExample(e);
         // 这里因为权限只有字典数据，所以仅仅做字典关联。
         this.buildRelationForDataList(permList, MyRelationParam.dictOnly());
         return permList;

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysRoleServiceImpl.java

@@ -1,6 +1,5 @@
 package com.orange.demo.webadmin.upms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.alibaba.fastjson.JSONObject;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.util.MyModelUtil;
@@ -71,12 +70,14 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
         role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         sysRoleMapper.insert(role);
         if (menuIdSet != null) {
+            List<SysRoleMenu> roleMenuList = new LinkedList<>();
             for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
-                sysRoleMenuMapper.insert(roleMenu);
+                roleMenuList.add(roleMenu);
             }
+            sysRoleMenuMapper.insertList(roleMenuList);
         }
         return role;
     }
@@ -92,20 +93,23 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(SysRole role, SysRole originalRole, Set<Long> menuIdSet) {
+        role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
         MyModelUtil.fillCommonsForUpdate(role, originalRole);
-        if (sysRoleMapper.updateById(role) != 1) {
+        if (sysRoleMapper.updateByPrimaryKey(role) != 1) {
             return false;
         }
         SysRoleMenu deletedRoleMenu = new SysRoleMenu();
         deletedRoleMenu.setRoleId(role.getRoleId());
-        sysRoleMenuMapper.delete(new QueryWrapper<>(deletedRoleMenu));
+        sysRoleMenuMapper.delete(deletedRoleMenu);
         if (menuIdSet != null) {
+            List<SysRoleMenu> roleMenuList = new LinkedList<>();
             for (Long menuId : menuIdSet) {
                 SysRoleMenu roleMenu = new SysRoleMenu();
                 roleMenu.setRoleId(role.getRoleId());
                 roleMenu.setMenuId(menuId);
-                sysRoleMenuMapper.insert(roleMenu);
+                roleMenuList.add(roleMenu);
             }
+            sysRoleMenuMapper.insertList(roleMenuList);
         }
         return true;
     }
@@ -119,15 +123,15 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long roleId) {
-        if (sysRoleMapper.deleteById(roleId) != 1) {
+        if (!this.removeById(roleId)) {
             return false;
         }
         SysRoleMenu roleMenu = new SysRoleMenu();
         roleMenu.setRoleId(roleId);
-        sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
+        sysRoleMenuMapper.delete(roleMenu);
         SysUserRole userRole = new SysUserRole();
         userRole.setRoleId(roleId);
-        sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
+        sysUserRoleMapper.delete(userRole);
         return true;
     }
 
@@ -151,9 +155,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addUserRoleList(List<SysUserRole> userRoleList) {
-        for (SysUserRole userRole : userRoleList) {
-            sysUserRoleMapper.insert(userRole);
-        }
+        sysUserRoleMapper.insertList(userRoleList);
     }
 
     /**
@@ -169,7 +171,7 @@ public class SysRoleServiceImpl extends BaseService<SysRole, Long> implements Sy
         SysUserRole userRole  = new SysUserRole();
         userRole.setRoleId(roleId);
         userRole.setUserId(userId);
-        return sysUserRoleMapper.delete(new QueryWrapper<>(userRole)) == 1;
+        return sysUserRoleMapper.delete(userRole) == 1;
     }
 
     /**

orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -1,7 +1,5 @@
 package com.orange.demo.webadmin.upms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.alibaba.fastjson.JSONObject;
 import com.orange.demo.webadmin.upms.service.*;
 import com.orange.demo.webadmin.upms.dao.*;
@@ -22,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -67,7 +66,8 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     public SysUser getSysUserByLoginName(String loginName) {
         SysUser filter = new SysUser();
         filter.setLoginName(loginName);
-        return sysUserMapper.selectOne(new QueryWrapper<>(filter));
+        filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.selectOne(filter);
     }
 
     /**
@@ -87,12 +87,14 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
         MyModelUtil.fillCommonsForInsert(user);
         sysUserMapper.insert(user);
         if (CollectionUtils.isNotEmpty(roleIdSet)) {
+            List<SysUserRole> userRoleList = new LinkedList<>();
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
                 userRole.setRoleId(roleId);
-                sysUserRoleMapper.insert(userRole);
+                userRoleList.add(userRole);
             }
+            sysUserRoleMapper.insertList(userRoleList);
         }
         return user;
     }
@@ -111,21 +113,23 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
         user.setLoginName(originalUser.getLoginName());
         user.setPassword(originalUser.getPassword());
         MyModelUtil.fillCommonsForUpdate(user, originalUser);
-        UpdateWrapper<SysUser> uw = this.createUpdateQueryForNullValue(user, user.getUserId());
-        if (sysUserMapper.update(user, uw) != 1) {
+        user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        if (sysUserMapper.updateByPrimaryKey(user) != 1) {
             return false;
         }
         // 先删除原有的User-Role关联关系，再重新插入新的关联关系
         SysUserRole deletedUserRole = new SysUserRole();
         deletedUserRole.setUserId(user.getUserId());
-        sysUserRoleMapper.delete(new QueryWrapper<>(deletedUserRole));
+        sysUserRoleMapper.delete(deletedUserRole);
         if (CollectionUtils.isNotEmpty(roleIdSet)) {
+            List<SysUserRole> userRoleList = new LinkedList<>();
             for (Long roleId : roleIdSet) {
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(user.getUserId());
                 userRole.setRoleId(roleId);
-                sysUserRoleMapper.insert(userRole);
+                userRoleList.add(userRole);
             }
+            sysUserRoleMapper.insertList(userRoleList);
         }
         return true;
     }
@@ -139,10 +143,13 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean changePassword(Long userId, String newPass) {
+        Example e = new Example(SysUser.class);
+        e.createCriteria()
+                .andEqualTo(super.idFieldName, userId)
+                .andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
         SysUser updatedUser = new SysUser();
-        updatedUser.setUserId(userId);
         updatedUser.setPassword(passwordEncoder.encode(newPass));
-        return sysUserMapper.updateById(updatedUser) == 1;
+        return sysUserMapper.updateByExampleSelective(updatedUser, e) == 1;
     }
 
     /**
@@ -154,12 +161,13 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean remove(Long userId) {
-        if (sysUserMapper.deleteById(userId) == 0) {
+        // 这里先删除主数据
+        if (!this.removeById(userId)) {
             return false;
         }
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(userId);
-        sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
+        sysUserRoleMapper.delete(userRole);
         return true;
     }
 
@@ -260,19 +268,19 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     /**
      * 验证用户对象关联的数据是否都合法。
      *
-     * @param sysUser          当前操作的对象。
-     * @param originalSysUser  原有对象。
-     * @param roleIdListString 逗号分隔的角色Id列表字符串。
+     * @param sysUser         当前操作的对象。
+     * @param originalSysUser 原有对象。
+     * @param roleIds         逗号分隔的角色Id列表字符串。
      * @return 验证结果。
      */
     @Override
-    public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIdListString) {
+    public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIds) {
         JSONObject jsonObject = new JSONObject();
-        if (StringUtils.isBlank(roleIdListString)) {
+        if (StringUtils.isBlank(roleIds)) {
             return CallResult.error("数据验证失败，用户的角色数据不能为空！");
         }
         Set<Long> roleIdSet = Arrays.stream(
-                roleIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+                roleIds.split(",")).map(Long::valueOf).collect(Collectors.toSet());
         if (!sysRoleService.existAllPrimaryKeys(roleIdSet)) {
             return CallResult.error("数据验证失败，存在不合法的用户角色，请刷新后重试！");
         }

orange-demo-single-service/application-webadmin/src/main/resources/application.yml

@@ -40,13 +40,16 @@ spring:
     request-context-attribute: request
     suffix: .ftl
 
-mybatis-plus:
-  mapper-locations: classpath:com/orange/demo/webadmin/*/dao/mapper/*Mapper.xml,com/orange/demo/common/log/dao/mapper/*Mapper.xml
-  type-aliases-package: com.orange.demo.webadmin.*.model,com.orange.demo.common.log.model
-  global-config:
-    db-config:
-      logic-delete-value: -1
-      logic-not-delete-value: 1
+# mybatis的基本配置
+mybatis:
+  mapperLocations: classpath:com/orange/demo/webadmin/*/dao/mapper/*Mapper.xml,com/orange/demo/common/log/dao/mapper/*Mapper.xml
+  typeAliasesPackage: com.orange.demo.webadmin.*.model,com.orange.demo.common.log.model
+
+# mybatis的通用mapper的配置
+mapper:
+  mappers: tk.mybatis.mapper.common.Mapper,tk.mybatis.mapper.additional.insert.InsertListMapper
+  not-empty: false
+  identity: MYSQL
 
 # 自动分页的配置
 pagehelper: