wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 19:16:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：添加多对多关联中间表更新支持，功能位于 班级管理 -> 课程 -> 编辑课程顺序

Browse Source
This commit is contained in:
Jerry
2020-09-27 22:22:59 +08:00
parent 295d466207
commit 307588694e
495 changed files with 7134 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/StatsApplication.java
View File

@@ -8,8 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
/**
* stats服务启动类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@SpringCloudApplication
@EnableFeignClients(basePackages = "com.orange.demo")

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/ApplicationConfig.java
View File

@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration;
* uploadFileBaseDir: /user/xxx/fileRoot/
* defaultSomething: defaultValue
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Data
@RefreshScope

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
View File

@@ -13,8 +13,8 @@ import javax.sql.DataSource;
/**
* 数据源配置Bean对象。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Configuration
@EnableTransactionManagement

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java
View File

@@ -21,8 +21,8 @@ import java.util.*;
/**
* 课程统计操作控制器类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Slf4j
@RestController

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java
View File

@@ -21,8 +21,8 @@ import java.util.*;
/**
* 学生行为统计操作控制器类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Slf4j
@RestController

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java
View File

@@ -23,8 +23,8 @@ import java.util.*;
/**
* 学生行为流水操作控制器类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Slf4j
@RestController

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/CourseTransStatsMapper.java
View File

@@ -9,8 +9,8 @@ import java.util.*;
/**
* 课程统计数据操作访问接口。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
public interface CourseTransStatsMapper extends BaseDaoMapper<CourseTransStats> {

13
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/GradeMapper.java Normal file
View File

@@ -0,0 +1,13 @@
package com.orange.demo.statsservice.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.statsservice.model.Grade;
/**
* 数据操作访问接口。
*
* @author Jerry
* @date 2020-09-27
*/
public interface GradeMapper extends BaseDaoMapper<Grade> {
}

13
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/SchoolInfoMapper.java Normal file
View File

@@ -0,0 +1,13 @@
package com.orange.demo.statsservice.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.statsservice.model.SchoolInfo;
/**
* 数据操作访问接口。
*
* @author Jerry
* @date 2020-09-27
*/
public interface SchoolInfoMapper extends BaseDaoMapper<SchoolInfo> {
}

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionStatsMapper.java
View File

@@ -9,8 +9,8 @@ import java.util.*;
/**
* 学生行为统计数据操作访问接口。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
public interface StudentActionStatsMapper extends BaseDaoMapper<StudentActionStats> {

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionTransMapper.java
View File

@@ -9,8 +9,8 @@ import java.util.*;
/**
* 学生行为流水数据操作访问接口。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
public interface StudentActionTransMapper extends BaseDaoMapper<StudentActionTrans> {

9
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/GradeMapper.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.orange.demo.statsservice.dao.GradeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.statsservice.model.Grade">
<id column="grade_id" jdbcType="INTEGER" property="gradeId"/>
<result column="grade_name" jdbcType="VARCHAR" property="gradeName"/>
<result column="status" jdbcType="INTEGER" property="status"/>
</resultMap>
</mapper>

10
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/SchoolInfoMapper.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.orange.demo.statsservice.dao.SchoolInfoMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.statsservice.model.SchoolInfo">
<id column="school_id" jdbcType="BIGINT" property="schoolId"/>
<result column="school_name" jdbcType="VARCHAR" property="schoolName"/>
<result column="province_id" jdbcType="BIGINT" property="provinceId"/>
<result column="city_id" jdbcType="BIGINT" property="cityId"/>
</resultMap>
</mapper>

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
View File

@@ -22,8 +22,8 @@ import java.util.Map;
/**
* CourseTransStats实体对象。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Data
@Table(name = "zz_course_trans_stats")

41
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java Normal file
View File

@@ -0,0 +1,41 @@
package com.orange.demo.statsservice.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
/**
* Grade实体对象。
*
* @author Jerry
* @date 2020-09-27
*/
@Data
@Table(name = "zz_grade")
public class Grade {
/**
* 主键Id。
*/
@NotNull(message = "数据验证失败，主键Id不能为空！")
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "grade_id")
private Integer gradeId;
/**
* 年级名称。
*/
@NotBlank(message = "数据验证失败，年级名称不能为空！")
@Column(name = "grade_name")
private String gradeName;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
@JSONField(serialize = false)
@DeletedFlagColumn
private Integer status;
}

45
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java Normal file
View File

@@ -0,0 +1,45 @@
package com.orange.demo.statsservice.model;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
/**
* SchoolInfo实体对象。
*
* @author Jerry
* @date 2020-09-27
*/
@Data
@Table(name = "zz_school_info")
public class SchoolInfo {
/**
* 学校Id。
*/
@NotNull(message = "数据验证失败，学校Id不能为空！")
@Id
@Column(name = "school_id")
private Long schoolId;
/**
* 学校名称。
*/
@NotBlank(message = "数据验证失败，学校名称不能为空！")
@Column(name = "school_name")
private String schoolName;
/**
* 所在省Id。
*/
@NotNull(message = "数据验证失败，所在省Id不能为空！")
@Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
@NotNull(message = "数据验证失败，所在城市Id不能为空！")
@Column(name = "city_id")
private Long cityId;
}

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
View File

@@ -19,8 +19,8 @@ import java.util.Map;
/**
* StudentActionStats实体对象。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Data
@Table(name = "zz_student_action_stats")

2
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
View File

@@ -24,7 +24,7 @@ import java.util.Map;
* StudentActionTrans实体对象。
*
* @author Jerry
* @date 2020-08-13
* @date 2020-09-27
*/
@Data
@Table(name = "zz_student_action_trans")

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/CourseTransStatsService.java
View File

@@ -16,8 +16,8 @@ import java.util.*;
/**
* 课程统计数据操作服务类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Service
public class CourseTransStatsService extends BaseService<CourseTransStats, CourseTransStatsDto, Long> {

4
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionStatsService.java
View File

@@ -16,8 +16,8 @@ import java.util.*;
/**
* 学生行为统计数据操作服务类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Service
public class StudentActionStatsService extends BaseService<StudentActionStats, StudentActionStatsDto, Long> {

5
orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionTransService.java
View File

@@ -21,8 +21,8 @@ import java.util.*;
/**
* 学生行为流水数据操作服务类。
*
* @author Orange Team
* @date 2020-08-08
* @author Jerry
* @date 2020-09-27
*/
@Service
public class StudentActionTransService extends BaseService<StudentActionTrans, StudentActionTransDto, Long> {
@@ -68,6 +68,7 @@ public class StudentActionTransService extends BaseService<StudentActionTrans, S
*/
@Transactional(rollbackFor = Exception.class)
public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
}