同步1.9.0

This commit is contained in:
Jerry
2021-09-01 20:08:27 +08:00
parent 6e84b4234c
commit 4f4995e6f0
198 changed files with 4017 additions and 1500 deletions

View File

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

View File

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

View File

@@ -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;

View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.CourseTransStatsVo;
import com.orange.demo.courseclassapi.vo.CourseVo;
import com.orange.demo.courseclassapi.client.CourseClient;
@@ -13,6 +12,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -24,79 +24,81 @@ import java.util.Map;
* @date 2020-08-08
*/
@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(
@@ -105,7 +107,7 @@ public class CourseTransStats {
slaveModelClass = GradeVo.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
@TableField(exist = false)
@Transient
private Map<String, Object> gradeIdDictMap;
@RelationDict(
@@ -114,13 +116,13 @@ public class CourseTransStats {
slaveModelClass = CourseVo.class,
slaveIdField = "courseId",
slaveNameField = "courseName")
@TableField(exist = false)
@Transient
private Map<String, Object> courseIdDictMap;
@RelationConstDict(
masterIdField = "subjectId",
constantDictClass = Subject.class)
@TableField(exist = false)
@Transient
private Map<String, Object> subjectIdDictMap;
@Mapper

View File

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

View File

@@ -1,7 +1,7 @@
package com.orange.demo.statsservice.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import javax.persistence.*;
/**
* SchoolInfo实体对象。
@@ -10,30 +10,31 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
@TableName(value = "zz_school_info")
@Table(name = "zz_school_info")
public class SchoolInfo {
/**
* 学校Id。
*/
@TableId(value = "school_id")
@Id
@Column(name = "school_id")
private Long schoolId;
/**
* 学校名称。
*/
@TableField(value = "school_name")
@Column(name = "school_name")
private String schoolName;
/**
* 所在省Id。
*/
@TableField(value = "province_id")
@Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
@TableField(value = "city_id")
@Column(name = "city_id")
private Long cityId;
}

View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.StudentActionStatsVo;
import com.orange.demo.courseclassapi.vo.AreaCodeVo;
import com.orange.demo.courseclassapi.vo.GradeVo;
@@ -11,6 +10,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -22,145 +22,146 @@ import java.util.Map;
* @date 2020-08-08
*/
@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(
@@ -169,7 +170,7 @@ public class StudentActionStats {
slaveModelClass = GradeVo.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
@TableField(exist = false)
@Transient
private Map<String, Object> gradeIdDictMap;
@RelationDict(
@@ -178,7 +179,7 @@ public class StudentActionStats {
slaveModelClass = AreaCodeVo.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
@TableField(exist = false)
@Transient
private Map<String, Object> provinceIdDictMap;
@RelationDict(
@@ -187,7 +188,7 @@ public class StudentActionStats {
slaveModelClass = AreaCodeVo.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
@TableField(exist = false)
@Transient
private Map<String, Object> cityIdDictMap;
@Mapper

View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.StudentActionTransVo;
import com.orange.demo.courseclassapi.client.SchoolInfoClient;
import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
@@ -14,6 +13,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -25,109 +25,110 @@ import java.util.Map;
* @date 2020-08-08
*/
@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(
@@ -136,7 +137,7 @@ public class StudentActionTrans {
slaveModelClass = SchoolInfoVo.class,
slaveIdField = "schoolId",
slaveNameField = "schoolName")
@TableField(exist = false)
@Transient
private Map<String, Object> schoolIdDictMap;
@RelationDict(
@@ -145,19 +146,19 @@ public class StudentActionTrans {
slaveModelClass = GradeVo.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

View File

@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.statsservice.service.*;
import com.orange.demo.statsservice.dao.*;
import com.orange.demo.statsservice.model.*;
@@ -76,8 +75,7 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
studentActionTrans.setCreateTime(originalStudentActionTrans.getCreateTime());
// 这里重点提示,在执行主表数据更新之前,如果有哪些字段不支持修改操作,请用原有数据对象字段替换当前数据字段。
UpdateWrapper<StudentActionTrans> uw = this.createUpdateQueryForNullValue(studentActionTrans, studentActionTrans.getTransId());
return studentActionTransMapper.update(studentActionTrans, uw) == 1;
return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
}
/**
@@ -89,7 +87,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);
}
/**

View File

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