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

commit：1.5多应用版本

Browse Source
This commit is contained in:
Jerry
2021-03-31 09:43:36 +08:00
parent 060cb450be
commit 71d07cefb3
1343 changed files with 11695 additions and 71470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
orange-demo-single-service/.DS_Store vendored
View File

Binary file not shown.

8
orange-demo-single-service/application/pom.xml → orange-demo-single-service/application-webadmin/pom.xml
View File

@@ -8,18 +8,18 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>application</artifactId>
<artifactId>application-webadmin</artifactId>
<version>1.0.0</version>
<name>application</name>
<packaging>jar</packaging>
<dependencies>
<!-- 业务组件依赖 -->
<dependency>
<dependency>
<groupId>com.orange.demo</groupId>
<artifactId>common-core</artifactId>
<artifactId>common-core</artifactId>
<version>1.0.0</version>
</dependency>
</dependency>
<dependency>
<groupId>com.orange.demo</groupId>
<artifactId>common-redis</artifactId>

22
orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java Normal file
View File

@@ -0,0 +1,22 @@
package com.orange.demo.webadmin;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;
/**
* 应用服务启动类。
*
* @author Jerry
* @date 2020-09-24
*/
@EnableAsync
@SpringBootApplication
@ComponentScan("com.orange.demo")
public class WebAdminApplication {
public static void main(String[] args) {
SpringApplication.run(WebAdminApplication.class, args);
}
}

8
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/AreaCodeController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import com.orange.demo.app.model.AreaCode;
import com.orange.demo.app.service.AreaCodeService;
import com.orange.demo.webadmin.app.model.AreaCode;
import com.orange.demo.webadmin.app.service.AreaCodeService;
import com.orange.demo.common.core.object.ResponseResult;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class AreaCodeController {
*/
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict() {
List<AreaCode> resultList = areaCodeService.getAllList();
List<AreaCode> resultList = areaCodeService.getAllListFromCache();
return ResponseResult.success(BeanQuery.select(
"parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
}

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/CourseController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import cn.hutool.core.util.ReflectUtil;
@@ -7,17 +7,17 @@ import com.orange.demo.common.core.upload.UpDownloaderFactory;
import com.orange.demo.common.core.upload.UploadResponseInfo;
import com.orange.demo.common.core.upload.UploadStoreInfo;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.config.ApplicationConfig;
import com.orange.demo.webadmin.config.ApplicationConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/CourseTransStatsController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

14
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/GradeController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java
View File

@@ -1,18 +1,18 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import cn.jimmyshi.beanquery.BeanQuery;
import com.orange.demo.app.dto.GradeDto;
import com.orange.demo.app.model.Grade;
import com.orange.demo.app.service.GradeService;
import com.orange.demo.webadmin.app.dto.GradeDto;
import com.orange.demo.webadmin.app.model.Grade;
import com.orange.demo.webadmin.app.service.GradeService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -99,6 +99,10 @@ public class GradeController {
@GetMapping("/listDict")
public ResponseResult<List<Map<String, Object>>> listDict() {
List<Grade> resultList = gradeService.getAllListFromCache();
if (CollectionUtils.isNotEmpty(resultList)) {
gradeService.reloadCachedData(true);
resultList = gradeService.getAllList();
}
return ResponseResult.success(BeanQuery.select(
"gradeId as id", "gradeName as name").executeFrom(resultList));
}

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/SchoolInfoController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/SchoolInfoController.java
View File

@@ -1,11 +1,11 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/StudentActionStatsController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/StudentActionTransController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/StudentClassController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/controller/StudentController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java
View File

@@ -1,11 +1,11 @@
package com.orange.demo.app.controller;
package com.orange.demo.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.app.vo.*;
import com.orange.demo.app.dto.*;
import com.orange.demo.app.model.*;
import com.orange.demo.app.service.*;
import com.orange.demo.webadmin.app.vo.*;
import com.orange.demo.webadmin.app.dto.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/AreaCodeMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.AreaCode;
import com.orange.demo.webadmin.app.model.AreaCode;
/**
* 行政区划数据操作访问接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/ClassCourseMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.ClassCourse;
import com.orange.demo.webadmin.app.model.ClassCourse;
/**
* 数据操作访问接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/ClassStudentMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.ClassStudent;
import com.orange.demo.webadmin.app.model.ClassStudent;
/**
* 数据操作访问接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/CourseMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.Course;
import com.orange.demo.webadmin.app.model.Course;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/CourseTransStatsMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.CourseTransStats;
import com.orange.demo.webadmin.app.model.CourseTransStats;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/GradeMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.Grade;
import com.orange.demo.webadmin.app.model.Grade;
/**
* 年级数据操作访问接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/MaterialEditionMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.MaterialEdition;
import com.orange.demo.webadmin.app.model.MaterialEdition;
/**
* 数据操作访问接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/SchoolInfoMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/SchoolInfoMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.SchoolInfo;
import com.orange.demo.webadmin.app.model.SchoolInfo;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/StudentActionStatsMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.StudentActionStats;
import com.orange.demo.webadmin.app.model.StudentActionStats;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/StudentActionTransMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.StudentActionTrans;
import com.orange.demo.webadmin.app.model.StudentActionTrans;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/StudentClassMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.StudentClass;
import com.orange.demo.webadmin.app.model.StudentClass;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/StudentMapper.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.dao;
package com.orange.demo.webadmin.app.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.app.model.Student;
import com.orange.demo.webadmin.app.model.Student;
import org.apache.ibatis.annotations.Param;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/AreaCodeMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.AreaCodeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.AreaCode">
<mapper namespace="com.orange.demo.webadmin.app.dao.AreaCodeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.AreaCode">
<id column="area_id" jdbcType="BIGINT" property="areaId"/>
<result column="area_name" jdbcType="VARCHAR" property="areaName"/>
<result column="area_level" jdbcType="INTEGER" property="areaLevel"/>

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/ClassCourseMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.ClassCourseMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.ClassCourse">
<mapper namespace="com.orange.demo.webadmin.app.dao.ClassCourseMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.ClassCourse">
<id column="class_id" jdbcType="BIGINT" property="classId"/>
<id column="course_id" jdbcType="BIGINT" property="courseId"/>
<result column="course_order" jdbcType="TINYINT" property="courseOrder"/>

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/ClassStudentMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.ClassStudentMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.ClassStudent">
<mapper namespace="com.orange.demo.webadmin.app.dao.ClassStudentMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.ClassStudent">
<id column="class_id" jdbcType="BIGINT" property="classId"/>
<id column="student_id" jdbcType="BIGINT" property="studentId"/>
</resultMap>

14
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/CourseMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.CourseMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.Course">
<mapper namespace="com.orange.demo.webadmin.app.dao.CourseMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.Course">
<id column="course_id" jdbcType="BIGINT" property="courseId"/>
<result column="course_name" jdbcType="VARCHAR" property="courseName"/>
<result column="price" jdbcType="DECIMAL" property="price"/>
@@ -16,15 +16,17 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<resultMap id="BaseResultMapWithClassCourse" type="com.orange.demo.app.model.Course" extends="BaseResultMap">
<resultMap id="BaseResultMapWithClassCourse" type="com.orange.demo.webadmin.app.model.Course" extends="BaseResultMap">
<association property="classCourse" column="course_id" foreignColumn="course_id"
notNullColumn="course_id" resultMap="com.orange.demo.app.dao.ClassCourseMapper.BaseResultMap" />
notNullColumn="course_id" resultMap="com.orange.demo.webadmin.app.dao.ClassCourseMapper.BaseResultMap" />
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.CourseMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.CourseMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="courseFilter != null">
@@ -62,7 +64,7 @@
</if>
</sql>
<select id="getCourseList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.Course">
<select id="getCourseList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.Course">
SELECT * FROM zz_course
<where>
<include refid="filterRef"/>

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/CourseTransStatsMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseTransStatsMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.CourseTransStatsMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.CourseTransStats">
<mapper namespace="com.orange.demo.webadmin.app.dao.CourseTransStatsMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.CourseTransStats">
<id column="stats_id" jdbcType="BIGINT" property="statsId"/>
<result column="stats_date" jdbcType="DATE" property="statsDate"/>
<result column="subject_id" jdbcType="TINYINT" property="subjectId"/>
@@ -13,11 +13,13 @@
<result column="student_flower_amount" jdbcType="INTEGER" property="studentFlowerAmount"/>
<result column="student_flower_count" jdbcType="INTEGER" property="studentFlowerCount"/>
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.CourseTransStatsMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.CourseTransStatsMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="courseTransStatsFilter != null">
@@ -36,7 +38,7 @@
</if>
</sql>
<select id="getGroupedCourseTransStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.CourseTransStats">
<select id="getGroupedCourseTransStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.CourseTransStats">
SELECT * FROM
(SELECT
SUM(student_attend_count) student_attend_count,
@@ -53,7 +55,7 @@
</if>
</select>
<select id="getCourseTransStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.CourseTransStats">
<select id="getCourseTransStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.CourseTransStats">
SELECT * FROM zz_course_trans_stats
<where>
<include refid="filterRef"/>

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/GradeMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/GradeMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.GradeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.Grade">
<mapper namespace="com.orange.demo.webadmin.app.dao.GradeMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.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"/>

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/MaterialEditionMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/MaterialEditionMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.MaterialEditionMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.MaterialEdition">
<mapper namespace="com.orange.demo.webadmin.app.dao.MaterialEditionMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.MaterialEdition">
<id column="edition_id" jdbcType="INTEGER" property="editionId"/>
<result column="edition_name" jdbcType="VARCHAR" property="editionName"/>
<result column="status" jdbcType="INTEGER" property="status"/>

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/SchoolInfoMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/SchoolInfoMapper.xml
View File

@@ -1,17 +1,19 @@
<?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.app.dao.SchoolInfoMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.SchoolInfo">
<mapper namespace="com.orange.demo.webadmin.app.dao.SchoolInfoMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.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>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.SchoolInfoMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.SchoolInfoMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="schoolInfoFilter != null">
@@ -28,7 +30,7 @@
</if>
</sql>
<select id="getSchoolInfoList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.SchoolInfo">
<select id="getSchoolInfoList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.SchoolInfo">
SELECT * FROM zz_school_info
<where>
<include refid="filterRef"/>

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/StudentActionStatsMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionStatsMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.StudentActionStatsMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.StudentActionStats">
<mapper namespace="com.orange.demo.webadmin.app.dao.StudentActionStatsMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.StudentActionStats">
<id column="stats_id" jdbcType="BIGINT" property="statsId"/>
<result column="stats_date" jdbcType="DATE" property="statsDate"/>
<result column="stats_month" jdbcType="DATE" property="statsMonth"/>
@@ -24,11 +24,13 @@
<result column="do_exercise_count" jdbcType="INTEGER" property="doExerciseCount"/>
<result column="do_exercise_correct_count" jdbcType="INTEGER" property="doExerciseCorrectCount"/>
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.StudentActionStatsMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.StudentActionStatsMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="studentActionStatsFilter != null">
@@ -50,7 +52,7 @@
</if>
</sql>
<select id="getGroupedStudentActionStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.StudentActionStats">
<select id="getGroupedStudentActionStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.StudentActionStats">
SELECT * FROM
(SELECT
SUM(buy_course_amount) buy_course_amount,
@@ -79,7 +81,7 @@
</if>
</select>
<select id="getStudentActionStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.StudentActionStats">
<select id="getStudentActionStatsList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.StudentActionStats">
SELECT * FROM zz_student_action_stats
<where>
<include refid="filterRef"/>

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/StudentActionTransMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionTransMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.StudentActionTransMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.StudentActionTrans">
<mapper namespace="com.orange.demo.webadmin.app.dao.StudentActionTransMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.StudentActionTrans">
<id column="trans_id" jdbcType="BIGINT" property="transId"/>
<result column="student_id" jdbcType="BIGINT" property="studentId"/>
<result column="student_name" jdbcType="VARCHAR" property="studentName"/>
@@ -18,11 +18,13 @@
<result column="exercise_correct_flag" jdbcType="TINYINT" property="exerciseCorrectFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.StudentActionTransMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.StudentActionTransMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="studentActionTransFilter != null">
@@ -50,7 +52,7 @@
</if>
</sql>
<select id="getStudentActionTransList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.StudentActionTrans">
<select id="getStudentActionTransList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.StudentActionTrans">
SELECT * FROM zz_student_action_trans
<where>
<include refid="filterRef"/>

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/StudentClassMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentClassMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.StudentClassMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.StudentClass">
<mapper namespace="com.orange.demo.webadmin.app.dao.StudentClassMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.StudentClass">
<id column="class_id" jdbcType="BIGINT" property="classId"/>
<result column="class_name" jdbcType="VARCHAR" property="className"/>
<result column="school_id" jdbcType="BIGINT" property="schoolId"/>
@@ -12,12 +12,14 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="status" jdbcType="TINYINT" property="status"/>
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.StudentClassMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.StudentClassMapper.inputFilterRef"/>
AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="studentClassFilter != null">
@@ -33,7 +35,7 @@
</if>
</sql>
<select id="getStudentClassList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.StudentClass">
<select id="getStudentClassList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.StudentClass">
SELECT * FROM zz_class
<where>
<include refid="filterRef"/>

10
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dao/mapper/StudentMapper.xml → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.app.dao.StudentMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.app.model.Student">
<mapper namespace="com.orange.demo.webadmin.app.dao.StudentMapper">
<resultMap id="BaseResultMap" type="com.orange.demo.webadmin.app.model.Student">
<id column="student_id" jdbcType="BIGINT" property="studentId"/>
<result column="login_mobile" jdbcType="VARCHAR" property="loginMobile"/>
<result column="student_name" jdbcType="VARCHAR" property="studentName"/>
@@ -18,11 +18,13 @@
<result column="register_time" jdbcType="TIMESTAMP" property="registerTime"/>
<result column="status" jdbcType="TINYINT" property="status"/>
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.orange.demo.app.dao.StudentMapper.inputFilterRef"/>
<include refid="com.orange.demo.webadmin.app.dao.StudentMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="studentFilter != null">
@@ -63,7 +65,7 @@
</if>
</sql>
<select id="getStudentList" resultMap="BaseResultMap" parameterType="com.orange.demo.app.model.Student">
<select id="getStudentList" resultMap="BaseResultMap" parameterType="com.orange.demo.webadmin.app.model.Student">
SELECT * FROM zz_student
<where>
<include refid="filterRef"/>

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/ClassCourseDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassCourseDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/ClassStudentDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassStudentDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/CourseDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseDto.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.app.model.constant.CourseDifficult;
import com.orange.demo.webadmin.app.model.constant.CourseDifficult;
import com.orange.demo.application.common.constant.Subject;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/CourseTransStatsDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseTransStatsDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/GradeDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/GradeDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/SchoolInfoDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/SchoolInfoDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/StudentActionStatsDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionStatsDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/StudentActionTransDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionTransDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/StudentClassDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentClassDto.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.app.model.constant.ClassLevel;
import com.orange.demo.webadmin.app.model.constant.ClassLevel;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/dto/StudentDto.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentDto.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.dto;
package com.orange.demo.webadmin.app.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;

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

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/ClassCourse.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassCourse.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import lombok.Data;
import javax.persistence.*;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/ClassStudent.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassStudent.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import lombok.Data;
import javax.persistence.*;

8
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/Course.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Course.java
View File

@@ -1,13 +1,13 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.app.model.constant.CourseDifficult;
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;
import com.orange.demo.common.core.annotation.UploadFlagColumn;
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.app.vo.CourseVo;
import com.orange.demo.webadmin.app.vo.CourseVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
@@ -169,7 +169,7 @@ public class Course {
* @param courseVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "classCourse", expression = "java(mapToBean(courseVo.getClassCourse(), com.orange.demo.app.model.ClassCourse.class))")
@Mapping(target = "classCourse", expression = "java(mapToBean(courseVo.getClassCourse(), com.orange.demo.webadmin.app.model.ClassCourse.class))")
@Override
Course toModel(CourseVo courseVo);
/**

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/CourseTransStats.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/CourseTransStats.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.application.common.constant.Subject;
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.app.vo.CourseTransStatsVo;
import com.orange.demo.webadmin.app.vo.CourseTransStatsVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

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

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/MaterialEdition.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/MaterialEdition.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import lombok.Data;
import javax.persistence.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/SchoolInfo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/SchoolInfo.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.app.vo.SchoolInfoVo;
import com.orange.demo.webadmin.app.vo.SchoolInfoVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/Student.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Student.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.application.common.constant.Gender;
import com.orange.demo.application.common.constant.ExpLevel;
@@ -7,7 +7,7 @@ import com.orange.demo.common.core.util.MyCommonUtil;
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.app.vo.StudentVo;
import com.orange.demo.webadmin.app.vo.StudentVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/StudentActionStats.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionStats.java
View File

@@ -1,8 +1,8 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.app.vo.StudentActionStatsVo;
import com.orange.demo.webadmin.app.vo.StudentActionStatsVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

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

@@ -1,11 +1,11 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.application.common.constant.StudentActionType;
import com.orange.demo.application.common.constant.DeviceType;
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.app.vo.StudentActionTransVo;
import com.orange.demo.webadmin.app.vo.StudentActionTransVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

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

@@ -1,11 +1,11 @@
package com.orange.demo.app.model;
package com.orange.demo.webadmin.app.model;
import com.orange.demo.app.model.constant.ClassLevel;
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.app.vo.StudentClassVo;
import com.orange.demo.webadmin.app.vo.StudentClassVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/constant/ClassLevel.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassLevel.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model.constant;
package com.orange.demo.webadmin.app.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/constant/ClassStatus.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassStatus.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model.constant;
package com.orange.demo.webadmin.app.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/model/constant/CourseDifficult.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/CourseDifficult.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.model.constant;
package com.orange.demo.webadmin.app.model.constant;
import java.util.HashMap;
import java.util.Map;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/AreaCodeService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/AreaCodeService.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.common.core.base.service.IBaseDictService;
import com.orange.demo.app.model.AreaCode;
import com.orange.demo.webadmin.app.model.AreaCode;
import java.util.Collection;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/CourseService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.IBaseService;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/CourseTransStatsService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseTransStatsService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.service.IBaseService;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/GradeService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/GradeService.java
View File

@@ -1,7 +1,7 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.common.core.base.service.IBaseDictService;
import com.orange.demo.app.model.Grade;
import com.orange.demo.webadmin.app.model.Grade;
/**
* 年级字典数据操作服务接口。

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/SchoolInfoService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/SchoolInfoService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.IBaseService;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/StudentActionStatsService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionStatsService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.service.IBaseService;
import java.util.*;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/StudentActionTransService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionTransService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.IBaseService;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/StudentClassService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentClassService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.IBaseService;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/StudentService.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentService.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.app.service;
package com.orange.demo.webadmin.app.service;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.IBaseService;

27
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/AreaCodeServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java
View File

@@ -1,17 +1,16 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.AreaCodeService;
import com.orange.demo.app.dao.AreaCodeMapper;
import com.orange.demo.app.model.AreaCode;
import com.orange.demo.webadmin.app.service.AreaCodeService;
import com.orange.demo.webadmin.app.dao.AreaCodeMapper;
import com.orange.demo.webadmin.app.model.AreaCode;
import com.orange.demo.common.core.cache.MapTreeDictionaryCache;
import com.orange.demo.common.core.base.service.BaseDictService;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
/**
* 行政区划的Service类。
@@ -30,22 +29,16 @@ public class AreaCodeServiceImpl extends BaseDictService<AreaCode, Long> impleme
this.dictionaryCache = MapTreeDictionaryCache.create(AreaCode::getAreaId, AreaCode::getParentId);
}
@PostConstruct
public void init() {
this.reloadCachedData(true);
}
@Override
protected BaseDaoMapper<AreaCode> mapper() {
return areaCodeMapper;
}
/**
* 加载数据库数据到内存缓存。
*/
@Override
public void loadCachedData() {
Example e = new Example(AreaCode.class);
e.orderBy("areaLevel");
List<AreaCode> areaCodeList = areaCodeMapper.selectByExample(e);
dictionaryCache.putAll(areaCodeList);
}
/**
* 根据上级行政区划Id，获取其下级行政区划列表。
*

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/CourseServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseServiceImpl.java
View File

@@ -1,14 +1,15 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -124,7 +125,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
@Override
public List<Course> getCourseListWithRelation(Course filter, String orderBy) {
List<Course> resultList = courseMapper.getCourseList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}

15
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/CourseTransStatsServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseTransStatsServiceImpl.java
View File

@@ -1,11 +1,12 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.base.service.BaseService;
import com.github.pagehelper.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,7 +61,8 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
@Override
public List<CourseTransStats> getCourseTransStatsListWithRelation(CourseTransStats filter, String orderBy) {
List<CourseTransStats> resultList = courseTransStatsMapper.getCourseTransStatsList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}
@@ -78,9 +80,10 @@ public class CourseTransStatsServiceImpl extends BaseService<CourseTransStats, L
CourseTransStats filter, String groupSelect, String groupBy, String orderBy) {
List<CourseTransStats> resultList =
courseTransStatsMapper.getGroupedCourseTransStatsList(filter, groupSelect, groupBy, orderBy);
int batchSize = resultList instanceof Page ? 0 : 1000;
// NOTE: 这里只是包含了关联数据，聚合计算数据没有包含。
// 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
this.buildRelationForDataList(resultList, MyRelationParam.normal());
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}
}

8
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/GradeServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/GradeServiceImpl.java
View File

@@ -1,11 +1,11 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.common.core.base.service.BaseDictService;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.redis.cache.RedisDictionaryCache;
import com.orange.demo.app.service.GradeService;
import com.orange.demo.app.dao.GradeMapper;
import com.orange.demo.app.model.Grade;
import com.orange.demo.webadmin.app.service.GradeService;
import com.orange.demo.webadmin.app.dao.GradeMapper;
import com.orange.demo.webadmin.app.model.Grade;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/SchoolInfoServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/SchoolInfoServiceImpl.java
View File

@@ -1,13 +1,14 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -106,7 +107,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
@Override
public List<SchoolInfo> getSchoolInfoListWithRelation(SchoolInfo filter, String orderBy) {
List<SchoolInfo> resultList = schoolInfoMapper.getSchoolInfoList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}

15
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/StudentActionStatsServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionStatsServiceImpl.java
View File

@@ -1,12 +1,13 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.util.MyModelUtil;
import com.github.pagehelper.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,7 +64,8 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
@Override
public List<StudentActionStats> getStudentActionStatsListWithRelation(StudentActionStats filter, String orderBy) {
List<StudentActionStats> resultList = studentActionStatsMapper.getStudentActionStatsList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}
@@ -81,9 +83,10 @@ public class StudentActionStatsServiceImpl extends BaseService<StudentActionStat
StudentActionStats filter, String groupSelect, String groupBy, String orderBy) {
List<StudentActionStats> resultList =
studentActionStatsMapper.getGroupedStudentActionStatsList(filter, groupSelect, groupBy, orderBy);
int batchSize = resultList instanceof Page ? 0 : 1000;
// NOTE: 这里只是包含了关联数据，聚合计算数据没有包含。
// 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
this.buildRelationForDataList(resultList, MyRelationParam.normal());
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}
}

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/StudentActionTransServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionTransServiceImpl.java
View File

@@ -1,13 +1,14 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,7 +109,8 @@ public class StudentActionTransServiceImpl extends BaseService<StudentActionTran
@Override
public List<StudentActionTrans> getStudentActionTransListWithRelation(StudentActionTrans filter, String orderBy) {
List<StudentActionTrans> resultList = studentActionTransMapper.getStudentActionTransList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}

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

@@ -1,8 +1,8 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.constant.GlobalDeletedFlag;
import com.orange.demo.common.core.object.TokenData;
@@ -11,6 +11,7 @@ import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -134,7 +135,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
@Override
public List<StudentClass> getStudentClassListWithRelation(StudentClass filter, String orderBy) {
List<StudentClass> resultList = studentClassMapper.getStudentClassList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}

12
orange-demo-single-service/application/src/main/java/com/orange/demo/app/service/impl/StudentServiceImpl.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentServiceImpl.java
View File

@@ -1,15 +1,16 @@
package com.orange.demo.app.service.impl;
package com.orange.demo.webadmin.app.service.impl;
import com.orange.demo.application.common.constant.StudentStatus;
import com.orange.demo.app.service.*;
import com.orange.demo.app.dao.*;
import com.orange.demo.app.model.*;
import com.orange.demo.webadmin.app.service.*;
import com.orange.demo.webadmin.app.dao.*;
import com.orange.demo.webadmin.app.model.*;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -126,7 +127,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
@Override
public List<Student> getStudentListWithRelation(Student filter, String orderBy) {
List<Student> resultList = studentMapper.getStudentList(filter, orderBy);
this.buildRelationForDataList(resultList, MyRelationParam.normal());
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/AreaCodeVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/AreaCodeVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/ClassCourseVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassCourseVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/ClassStudentVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassStudentVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/CourseTransStatsVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseTransStatsVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/CourseVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/GradeVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/GradeVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/SchoolInfoVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/SchoolInfoVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/StudentActionStatsVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionStatsVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/StudentActionTransVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionTransVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/StudentClassVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentClassVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/app/vo/StudentVo.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentVo.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.app.vo;
package com.orange.demo.webadmin.app.vo;
import lombok.Data;

2
orange-demo-single-service/application/src/main/java/com/orange/demo/config/ApplicationConfig.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/ApplicationConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.config;
package com.orange.demo.webadmin.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/config/DataSourceConfig.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/DataSourceConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.config;
package com.orange.demo.webadmin.config;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -18,7 +18,7 @@ import javax.sql.DataSource;
*/
@Configuration
@EnableTransactionManagement
@MapperScan(value = {"com.orange.demo.*.dao"})
@MapperScan(value = {"com.orange.demo.webadmin.*.dao", "com.orange.demo.common.*.dao"})
public class DataSourceConfig {
@Bean(initMethod = "init", destroyMethod = "close")

2
orange-demo-single-service/application/src/main/java/com/orange/demo/config/FilterConfig.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/FilterConfig.java
View File

@@ -1,4 +1,4 @@
package com.orange.demo.config;
package com.orange.demo.webadmin.config;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.web.servlet.FilterRegistrationBean;

4
orange-demo-single-service/application/src/main/java/com/orange/demo/config/InterceptorConfig.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/InterceptorConfig.java
View File

@@ -1,6 +1,6 @@
package com.orange.demo.config;
package com.orange.demo.webadmin.config;
import com.orange.demo.interceptor.AuthenticationInterceptor;
import com.orange.demo.webadmin.interceptor.AuthenticationInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/interceptor/AuthenticationInterceptor.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/interceptor/AuthenticationInterceptor.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.interceptor;
package com.orange.demo.webadmin.interceptor;
import com.alibaba.fastjson.JSON;
import com.orange.demo.config.ApplicationConfig;
import com.orange.demo.upms.model.SysPermWhitelist;
import com.orange.demo.upms.service.SysPermWhitelistService;
import com.orange.demo.upms.service.SysPermService;
import com.orange.demo.webadmin.config.ApplicationConfig;
import com.orange.demo.webadmin.upms.model.SysPermWhitelist;
import com.orange.demo.webadmin.upms.service.SysPermWhitelistService;
import com.orange.demo.webadmin.upms.service.SysPermService;
import com.orange.demo.common.core.annotation.NoAuthInterface;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;

16
orange-demo-single-service/application/src/main/java/com/orange/demo/upms/controller/LoginController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginController.java
View File

@@ -1,13 +1,13 @@
package com.orange.demo.upms.controller;
package com.orange.demo.webadmin.upms.controller;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.config.ApplicationConfig;
import com.orange.demo.upms.service.*;
import com.orange.demo.upms.model.SysMenu;
import com.orange.demo.upms.model.SysUser;
import com.orange.demo.upms.model.constant.SysUserStatus;
import com.orange.demo.upms.model.constant.SysUserType;
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.constant.SysUserStatus;
import com.orange.demo.webadmin.upms.model.constant.SysUserType;
import com.orange.demo.common.core.annotation.NoAuthInterface;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.constant.ApplicationConstant;
@@ -92,6 +92,8 @@ public class LoginController {
tokenData.setShowName(user.getShowName());
tokenData.setIsAdmin(isAdmin);
cacheHelper.putTokenData(sessionId, tokenData);
// 这里手动将TokenData存入request，便于OperationLogAspect统一处理操作日志。
TokenData.addToRequest(tokenData);
Collection<SysMenu> menuList;
Collection<String> permCodeList;
if (isAdmin) {

10
orange-demo-single-service/application/src/main/java/com/orange/demo/upms/controller/SysMenuController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysMenuController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.upms.controller;
package com.orange.demo.webadmin.upms.controller;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.upms.dto.SysMenuDto;
import com.orange.demo.upms.vo.SysMenuVo;
import com.orange.demo.upms.model.SysMenu;
import com.orange.demo.upms.service.SysMenuService;
import com.orange.demo.webadmin.upms.dto.SysMenuDto;
import com.orange.demo.webadmin.upms.vo.SysMenuVo;
import com.orange.demo.webadmin.upms.model.SysMenu;
import com.orange.demo.webadmin.upms.service.SysMenuService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/upms/controller/SysPermCodeController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermCodeController.java
View File

@@ -1,10 +1,10 @@
package com.orange.demo.upms.controller;
package com.orange.demo.webadmin.upms.controller;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.upms.dto.SysPermCodeDto;
import com.orange.demo.upms.vo.SysPermCodeVo;
import com.orange.demo.upms.model.SysPermCode;
import com.orange.demo.upms.service.SysPermCodeService;
import com.orange.demo.webadmin.upms.dto.SysPermCodeDto;
import com.orange.demo.webadmin.upms.vo.SysPermCodeVo;
import com.orange.demo.webadmin.upms.model.SysPermCode;
import com.orange.demo.webadmin.upms.service.SysPermCodeService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;

10
orange-demo-single-service/application/src/main/java/com/orange/demo/upms/controller/SysPermController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermController.java
View File

@@ -1,12 +1,12 @@
package com.orange.demo.upms.controller;
package com.orange.demo.webadmin.upms.controller;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.upms.dto.SysPermDto;
import com.orange.demo.upms.vo.SysPermVo;
import com.orange.demo.upms.model.SysPerm;
import com.orange.demo.upms.service.SysPermService;
import com.orange.demo.webadmin.upms.dto.SysPermDto;
import com.orange.demo.webadmin.upms.vo.SysPermVo;
import com.orange.demo.webadmin.upms.model.SysPerm;
import com.orange.demo.webadmin.upms.service.SysPermService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;

12
orange-demo-single-service/application/src/main/java/com/orange/demo/upms/controller/SysPermModuleController.java → orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermModuleController.java
View File

@@ -1,11 +1,11 @@
package com.orange.demo.upms.controller;
package com.orange.demo.webadmin.upms.controller;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.upms.dto.SysPermModuleDto;
import com.orange.demo.upms.vo.SysPermModuleVo;
import com.orange.demo.upms.model.SysPerm;
import com.orange.demo.upms.model.SysPermModule;
import com.orange.demo.upms.service.SysPermModuleService;
import com.orange.demo.webadmin.upms.dto.SysPermModuleDto;
import com.orange.demo.webadmin.upms.vo.SysPermModuleVo;
import com.orange.demo.webadmin.upms.model.SysPerm;
import com.orange.demo.webadmin.upms.model.SysPermModule;
import com.orange.demo.webadmin.upms.service.SysPermModuleService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;

Some files were not shown because too many files have changed in this diff Show More