diff --git a/orange-demo-single/orange-demo-single-service/README.md b/orange-demo-single/orange-demo-single-service/README.md index 0939c817..20274fd0 100644 --- a/orange-demo-single/orange-demo-single-service/README.md +++ b/orange-demo-single/orange-demo-single-service/README.md @@ -1,5 +1,7 @@ ### 服务接口文档 --- +- Knife4j + - 服务启动后，Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus) - Postman - 无需启动服务，即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下，找到ExportApiApp文件，并执行main函数。 diff --git a/orange-demo-single/orange-demo-single-service/application-common/pom.xml b/orange-demo-single/orange-demo-single-service/application-common/pom.xml index a1eb142a..23cbd36e 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/pom.xml +++ b/orange-demo-single/orange-demo-single-service/application-common/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orange.demo + com.orangeforms OrangeSingleDemo 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java index 1dab32df..15b21b8b 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java index acd2481f..1ab88021 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java index fe098160..412e340b 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java index e546ff4e..15163405 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java index 9c39f2b1..fa087cc6 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java index 9bf21fb4..00c859d4 100644 --- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java +++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java @@ -1,4 +1,4 @@ -package com.orange.demo.application.common.constant; +package com.orangeforms.application.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml index 139cd567..c5db6824 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml @@ -2,7 +2,7 @@ - com.orange.demo + com.orangeforms OrangeSingleDemo 1.0.0 @@ -16,30 +16,35 @@ - com.orange.demo + com.orangeforms common-redis 1.0.0 - com.orange.demo + com.orangeforms common-log 1.0.0 - com.orange.demo + com.orangeforms common-sequence 1.0.0 - com.orange.demo + com.orangeforms common-datafilter 1.0.0 - com.orange.demo + com.orangeforms application-common 1.0.0 + + com.orangeforms + common-swagger + 1.0.0 + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java deleted file mode 100644 index 94e1de59..00000000 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.orange.demo.webadmin.upms.dto; - -import lombok.Data; - -/** - * 数据权限与部门关联Dto。 - * - * @author Jerry - * @date 2020-09-24 - */ -@Data -public class SysDataPermDeptDto { - - /** - * 数据权限Id。 - */ - private Long dataPermId; - - /** - * 关联部门Id。 - */ - private Long deptId; -} \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java deleted file mode 100644 index 511b265d..00000000 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.orange.demo.webadmin.upms.dto; - -import com.orange.demo.common.core.validator.UpdateGroup; - -import lombok.Data; - -import javax.validation.constraints.*; - -/** - * SysDeptDto对象。 - * - * @author Jerry - * @date 2020-09-24 - */ -@Data -public class SysDeptDto { - - /** - * 部门Id。 - */ - @NotNull(message = "数据验证失败，部门Id不能为空！", groups = {UpdateGroup.class}) - private Long deptId; - - /** - * 部门名称。 - */ - @NotBlank(message = "数据验证失败，部门名称不能为空！") - private String deptName; - - /** - * 显示顺序。 - */ - @NotNull(message = "数据验证失败，显示顺序不能为空！") - private Integer showOrder; - - /** - * 父部门Id。 - */ - private Long parentId; -} diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java index 243ab268..8e456cec 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin; +package com.orangeforms.webadmin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync; */ @EnableAsync @SpringBootApplication -@ComponentScan("com.orange.demo") +@ComponentScan("com.orangeforms") public class WebAdminApplication { public static void main(String[] args) { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java index 1d33bde5..ef96a4b1 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java @@ -1,10 +1,11 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; +import io.swagger.annotations.Api; import cn.jimmyshi.beanquery.BeanQuery; -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 com.orange.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.app.model.AreaCode; +import com.orangeforms.webadmin.app.service.AreaCodeService; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -21,6 +22,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "行政区划数据访问接口") @RestController @RequestMapping("/admin/app/areaCode") public class AreaCodeController { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java index f0eed0ac..5284a34d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java @@ -1,24 +1,26 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import cn.jimmyshi.beanquery.BeanQuery; import cn.hutool.core.util.ReflectUtil; -import com.orange.demo.common.core.upload.BaseUpDownloader; -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.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.core.upload.BaseUpDownloader; +import com.orangeforms.common.core.upload.UpDownloaderFactory; +import com.orangeforms.common.core.upload.UploadResponseInfo; +import com.orangeforms.common.core.upload.UploadStoreInfo; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -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.redis.cache.SessionCacheHelper; -import com.orange.demo.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.redis.cache.SessionCacheHelper; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +35,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "课程数据管理接口") @Slf4j @RestController @RequestMapping("/admin/app/course") @@ -53,6 +56,14 @@ public class CourseController { * @param courseDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = { + "courseDto.courseId", + "courseDto.priceStart", + "courseDto.priceEnd", + "courseDto.classHourStart", + "courseDto.classHourEnd", + "courseDto.createTimeStart", + "courseDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody CourseDto courseDto) { @@ -64,8 +75,7 @@ public class CourseController { // 验证关联Id的数据合法性 CallResult callResult = courseService.verifyRelatedData(course, null); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } course = courseService.saveNew(course); return ResponseResult.success(course.getCourseId()); @@ -77,6 +87,13 @@ public class CourseController { * @param courseDto 更新对象。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = { + "courseDto.priceStart", + "courseDto.priceEnd", + "courseDto.classHourStart", + "courseDto.classHourEnd", + "courseDto.createTimeStart", + "courseDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update(@MyRequestBody CourseDto courseDto) { @@ -94,8 +111,7 @@ public class CourseController { // 验证关联Id的数据合法性 CallResult callResult = courseService.verifyRelatedData(course, originalCourse); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } if (!courseService.update(course, originalCourse)) { return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST); diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java index 70400373..434a6fe4 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java @@ -1,14 +1,15 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import com.github.pagehelper.page.PageMethod; -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.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,6 +22,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "课程统计管理接口") @Slf4j @RestController @RequestMapping("/admin/app/courseTransStats") diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java similarity index 86% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java index b44fe17f..6d664385 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java @@ -1,18 +1,20 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import com.alibaba.fastjson.JSONObject; import cn.jimmyshi.beanquery.BeanQuery; -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 com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.app.dto.GradeDto; +import com.orangeforms.webadmin.app.model.Grade; +import com.orangeforms.webadmin.app.service.GradeService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +29,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "年级管理接口") @Slf4j @RestController @RequestMapping("/admin/app/grade") @@ -41,6 +44,7 @@ public class GradeController { * @param gradeDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"gradeDto.gradeId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody GradeDto gradeDto) { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java index adbec277..ff41fb71 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java @@ -1,14 +1,15 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import com.github.pagehelper.page.PageMethod; -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.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,6 +22,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "学生行为统计管理接口") @Slf4j @RestController @RequestMapping("/admin/app/studentActionStats") diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java index 1530b765..de926864 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java @@ -1,16 +1,18 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -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.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,6 +25,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "学生行为流水管理接口") @Slf4j @RestController @RequestMapping("/admin/app/studentActionTrans") @@ -37,6 +40,10 @@ public class StudentActionTransController { * @param studentActionTransDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = { + "studentActionTransDto.transId", + "studentActionTransDto.createTimeStart", + "studentActionTransDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody StudentActionTransDto studentActionTransDto) { @@ -48,8 +55,7 @@ public class StudentActionTransController { // 验证关联Id的数据合法性 CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, null); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } studentActionTrans = studentActionTransService.saveNew(studentActionTrans); return ResponseResult.success(studentActionTrans.getTransId()); @@ -61,6 +67,9 @@ public class StudentActionTransController { * @param studentActionTransDto 更新对象。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = { + "studentActionTransDto.createTimeStart", + "studentActionTransDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update(@MyRequestBody StudentActionTransDto studentActionTransDto) { @@ -78,8 +87,7 @@ public class StudentActionTransController { // 验证关联Id的数据合法性 CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, originalStudentActionTrans); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } if (!studentActionTransService.update(studentActionTrans, originalStudentActionTrans)) { return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST); diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java index 7cefa1b7..8ddf2a26 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java @@ -1,16 +1,18 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -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.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,6 +26,7 @@ import java.util.stream.Collectors; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "班级数据管理接口") @Slf4j @RestController @RequestMapping("/admin/app/studentClass") @@ -42,6 +45,7 @@ public class StudentClassController { * @param studentClassDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"studentClassDto.classId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody StudentClassDto studentClassDto) { @@ -53,8 +57,7 @@ public class StudentClassController { // 验证关联Id的数据合法性 CallResult callResult = studentClassService.verifyRelatedData(studentClass, null); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } studentClass = studentClassService.saveNew(studentClass); return ResponseResult.success(studentClass.getClassId()); @@ -83,8 +86,7 @@ public class StudentClassController { // 验证关联Id的数据合法性 CallResult callResult = studentClassService.verifyRelatedData(studentClass, originalStudentClass); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } if (!studentClassService.update(studentClass, originalStudentClass)) { return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST); @@ -189,6 +191,7 @@ public class StudentClassController { courseList = courseService.getNotInCourseListByClassId(classId, filter, orderBy); } else { courseList = courseService.getCourseList(filter, orderBy); + courseService.buildRelationForDataList(courseList, MyRelationParam.dictOnly()); } return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE)); } @@ -342,6 +345,7 @@ public class StudentClassController { studentList = studentService.getNotInStudentListByClassId(classId, filter, orderBy); } else { studentList = studentService.getStudentList(filter, orderBy); + studentService.buildRelationForDataList(studentList, MyRelationParam.dictOnly()); } return ResponseResult.success(MyPageUtil.makeResponseData(studentList, Student.INSTANCE)); } @@ -424,24 +428,4 @@ public class StudentClassController { } return ResponseResult.success(); } - - private String doBusinessDataVerify( - StudentClassDto studentClassDto, - boolean forUpdate, - List classCourseDtoList, - List classStudentDtoList) { - String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto, forUpdate); - if (errorMessage != null) { - return errorMessage; - } - errorMessage = MyCommonUtil.getModelValidationError(classCourseDtoList); - if (errorMessage != null) { - return "参数 [classCourseDtoList] 数据验证失败" + errorMessage; - } - errorMessage = MyCommonUtil.getModelValidationError(classStudentDtoList); - if (errorMessage != null) { - return "参数 [classStudentDtoList] 数据验证失败" + errorMessage; - } - return null; - } } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java index 0ea4430e..950a62e7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java @@ -1,17 +1,19 @@ -package com.orange.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import cn.jimmyshi.beanquery.BeanQuery; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -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.orangeforms.webadmin.app.vo.*; +import com.orangeforms.webadmin.app.dto.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,6 +26,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "学生数据管理接口") @Slf4j @RestController @RequestMapping("/admin/app/student") @@ -38,6 +41,13 @@ public class StudentController { * @param studentDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = { + "studentDto.studentId", + "studentDto.searchString", + "studentDto.birthdayStart", + "studentDto.birthdayEnd", + "studentDto.registerTimeStart", + "studentDto.registerTimeEnd"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody StudentDto studentDto) { @@ -49,8 +59,7 @@ public class StudentController { // 验证关联Id的数据合法性 CallResult callResult = studentService.verifyRelatedData(student, null); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } student = studentService.saveNew(student); return ResponseResult.success(student.getStudentId()); @@ -62,6 +71,12 @@ public class StudentController { * @param studentDto 更新对象。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = { + "studentDto.searchString", + "studentDto.birthdayStart", + "studentDto.birthdayEnd", + "studentDto.registerTimeStart", + "studentDto.registerTimeEnd"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update(@MyRequestBody StudentDto studentDto) { @@ -79,8 +94,7 @@ public class StudentController { // 验证关联Id的数据合法性 CallResult callResult = studentService.verifyRelatedData(student, originalStudent); if (!callResult.isSuccess()) { - errorMessage = callResult.getErrorMessage(); - return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); + return ResponseResult.errorFrom(callResult); } if (!studentService.update(student, originalStudent)) { return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST); diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java similarity index 51% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java index cf6f342a..fbf9293f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.AreaCode; /** * 行政区划数据操作访问接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java similarity index 68% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java index 3f0b9948..69ebef35 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.ClassCourse; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.ClassCourse; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java similarity index 68% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java index cac49c21..169b64b2 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.ClassStudent; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.ClassStudent; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java index d563f740..824702e8 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.Course; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.Course; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java index 820b67ac..6a61252f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.CourseTransStats; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.CourseTransStats; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java similarity index 68% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java index 766d3092..b296b969 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.Grade; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.Grade; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java similarity index 69% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java index e4ef51fc..24f4e1f3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.MaterialEdition; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.MaterialEdition; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java index fac57279..e284204c 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.StudentActionStats; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.StudentActionStats; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java index 6f4fe06b..b556fc41 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.StudentActionTrans; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.StudentActionTrans; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java index 6a2f5bcd..2bdb53b5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.StudentClass; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.StudentClass; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java index 30284477..22fd6c53 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.app.model.Student; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.Student; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml similarity index 79% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml index aa7cdb10..09e629fa 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml similarity index 85% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml index 7bc14dac..d4f87e62 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml index a7588f1c..d854784e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml index e285da41..60c3a7ba 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -16,9 +16,9 @@ - + + notNullColumn="course_id" resultMap="com.orangeforms.webadmin.app.dao.ClassCourseMapper.BaseResultMap" /> @@ -55,7 +55,7 @@ - + @@ -95,7 +95,7 @@ - SELECT * FROM zz_course diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseTransStatsMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseTransStatsMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml index 4dc20409..f486d6e5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseTransStatsMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -44,7 +44,7 @@ - + @@ -65,7 +65,7 @@ - SELECT * FROM (SELECT SUM(student_attend_count) student_attend_count, @@ -82,7 +82,7 @@ - SELECT * FROM zz_course_trans_stats diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/GradeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml similarity index 85% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/GradeMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml index a183fda0..00a1865b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/GradeMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/MaterialEditionMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml similarity index 86% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/MaterialEditionMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml index c5708185..f8679079 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/MaterialEditionMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionStatsMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionStatsMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml index 4959fccb..fa08640e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionStatsMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -77,7 +77,7 @@ - + @@ -101,7 +101,7 @@ - SELECT * FROM (SELECT SUM(buy_course_amount) buy_course_amount, @@ -130,7 +130,7 @@ - SELECT * FROM zz_student_action_stats diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionTransMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionTransMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml index db9fea60..c5c8b4cb 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentActionTransMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -59,7 +59,7 @@ - + @@ -89,7 +89,7 @@ - SELECT * FROM zz_student_action_trans diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentClassMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentClassMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml index ebe7e172..e86de237 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentClassMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -41,8 +41,8 @@ - - AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_class.status = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -60,7 +60,7 @@ - SELECT * FROM zz_class diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml similarity index 96% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml index d2d4a7b7..2096a6b8 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/StudentMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -59,7 +59,7 @@ - + @@ -102,7 +102,7 @@ - SELECT * FROM zz_student diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassCourseDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java similarity index 63% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassCourseDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java index 97d253c3..8a9490c3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassCourseDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java @@ -1,7 +1,9 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -12,24 +14,28 @@ import javax.validation.constraints.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("ClassCourseDto对象") @Data public class ClassCourseDto { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id", required = true) @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class}) private Long classId; /** * 课程Id。 */ + @ApiModelProperty(value = "课程Id", required = true) @NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class}) private Long courseId; /** * 课程顺序(数值越小越靠前)。 */ + @ApiModelProperty(value = "课程顺序(数值越小越靠前)", required = true) @NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！", groups = {UpdateGroup.class}) private Integer courseOrder; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassStudentDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassStudentDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java index dd1c21ce..5994c4c3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/ClassStudentDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java @@ -1,7 +1,9 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -12,18 +14,21 @@ import javax.validation.constraints.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("ClassStudentDto对象") @Data public class ClassStudentDto { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id", required = true) @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class}) private Long classId; /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id", required = true) @NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class}) private Long studentId; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java similarity index 56% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java index 1e46a88f..a3c90883 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java @@ -1,15 +1,18 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.webadmin.app.model.constant.CourseDifficult; -import com.orange.demo.application.common.constant.Subject; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.webadmin.app.model.constant.CourseDifficult; +import com.orangeforms.application.common.constant.Subject; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; import java.math.BigDecimal; +import java.util.Date; /** * CourseDto对象。 @@ -17,35 +20,41 @@ import java.math.BigDecimal; * @author Jerry * @date 2020-09-24 */ +@ApiModel("CourseDto对象") @Data public class CourseDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id", required = true) @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class}) private Long courseId; /** * 课程名称。 */ + @ApiModelProperty(value = "课程名称", required = true) @NotBlank(message = "数据验证失败，课程名称不能为空！") private String courseName; /** * 课程价格。 */ + @ApiModelProperty(value = "课程价格", required = true) @NotNull(message = "数据验证失败，课程价格不能为空！") private BigDecimal price; /** * 课程描述。 */ + @ApiModelProperty(value = "课程描述") private String description; /** * 课程难度(0: 容易 1: 普通 2: 很难)。 */ + @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)", required = true) @NotNull(message = "数据验证失败，课程难度不能为空！") @ConstDictRef(constDictClass = CourseDifficult.class, message = "数据验证失败，课程难度为无效值！") private Integer difficulty; @@ -53,12 +62,14 @@ public class CourseDto { /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id", required = true) @NotNull(message = "数据验证失败，所属年级不能为空！") private Integer gradeId; /** * 学科Id。 */ + @ApiModelProperty(value = "学科Id", required = true) @NotNull(message = "数据验证失败，所属学科不能为空！") @ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属学科为无效值！") private Integer subjectId; @@ -66,42 +77,68 @@ public class CourseDto { /** * 课时数量。 */ + @ApiModelProperty(value = "课时数量", required = true) @NotNull(message = "数据验证失败，课时数量不能为空！") private Integer classHour; /** * 多张课程图片地址。 */ + @ApiModelProperty(value = "多张课程图片地址", required = true) @NotBlank(message = "数据验证失败，课程图片不能为空！") private String pictureUrl; + /** + * 创建用户Id。 + */ + @ApiModelProperty(value = "创建用户Id") + private Long createUserId; + + /** + * 创建时间。 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 最后修改时间。 + */ + @ApiModelProperty(value = "最后修改时间") + private Date updateTime; + /** * price 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "price 范围过滤起始值(>=)") private BigDecimal priceStart; /** * price 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "price 范围过滤结束值(<=)") private BigDecimal priceEnd; /** * classHour 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "classHour 范围过滤起始值(>=)") private Integer classHourStart; /** * classHour 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "classHour 范围过滤结束值(<=)") private Integer classHourEnd; /** * createTime 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "createTime 范围过滤起始值(>=)") private String createTimeStart; /** * createTime 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "createTime 范围过滤结束值(<=)") private String createTimeEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseTransStatsDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java similarity index 63% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseTransStatsDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java index 1c7fa993..9209baf8 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/CourseTransStatsDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java @@ -1,9 +1,11 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.application.common.constant.Subject; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.application.common.constant.Subject; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -16,24 +18,28 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("CourseTransStatsDto对象") @Data public class CourseTransStatsDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id", required = true) @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class}) private Long statsId; /** * 统计日期。 */ + @ApiModelProperty(value = "统计日期", required = true) @NotNull(message = "数据验证失败，统计日期不能为空！") private Date statsDate; /** * 科目Id。 */ + @ApiModelProperty(value = "科目Id", required = true) @NotNull(message = "数据验证失败，所属科目不能为空！") @ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属科目为无效值！") private Integer subjectId; @@ -41,50 +47,59 @@ public class CourseTransStatsDto { /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id", required = true) @NotNull(message = "数据验证失败，所属年级不能为空！") private Integer gradeId; /** * 年级名称。 */ + @ApiModelProperty(value = "年级名称") private String gradeName; /** * 课程Id。 */ + @ApiModelProperty(value = "课程Id", required = true) @NotNull(message = "数据验证失败，课程Id不能为空！") private Long courseId; /** * 课程名称。 */ + @ApiModelProperty(value = "课程名称") private String courseName; /** * 学生上课次数。 */ + @ApiModelProperty(value = "学生上课次数", required = true) @NotNull(message = "数据验证失败，上课次数不能为空！") private Integer studentAttendCount; /** * 学生献花数量。 */ + @ApiModelProperty(value = "学生献花数量", required = true) @NotNull(message = "数据验证失败，献花数量不能为空！") private Integer studentFlowerAmount; /** * 学生献花次数。 */ + @ApiModelProperty(value = "学生献花次数", required = true) @NotNull(message = "数据验证失败，献花次数不能为空！") private Integer studentFlowerCount; /** * statsDate 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "statsDate 范围过滤起始值(>=)") private String statsDateStart; /** * statsDate 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "statsDate 范围过滤结束值(<=)") private String statsDateEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/GradeDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java similarity index 58% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/GradeDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java index c0e8f32c..1dde3d08 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/GradeDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java @@ -1,7 +1,9 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -12,18 +14,21 @@ import javax.validation.constraints.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("GradeDto对象") @Data public class GradeDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id", required = true) @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class}) private Integer gradeId; /** * 年级名称。 */ + @ApiModelProperty(value = "年级名称", required = true) @NotBlank(message = "数据验证失败，年级名称不能为空！") private String gradeName; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionStatsDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java similarity index 69% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionStatsDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java index 6e312993..42a704c7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionStatsDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java @@ -1,7 +1,9 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -14,141 +16,165 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentActionStatsDto对象") @Data public class StudentActionStatsDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id", required = true) @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class}) private Long statsId; /** * 统计日期。 */ + @ApiModelProperty(value = "统计日期", required = true) @NotNull(message = "数据验证失败，统计日期不能为空！") private Date statsDate; /** * 统计小时。 */ + @ApiModelProperty(value = "统计小时") private Date statsMonth; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id", required = true) @NotNull(message = "数据验证失败，所属年级不能为空！") private Integer gradeId; /** * 学生所在省Id。 */ + @ApiModelProperty(value = "学生所在省Id", required = true) @NotNull(message = "数据验证失败，所在省份不能为空！") private Long provinceId; /** * 学生所在城市Id。 */ + @ApiModelProperty(value = "学生所在城市Id", required = true) @NotNull(message = "数据验证失败，所在城市不能为空！", groups = {UpdateGroup.class}) private Long cityId; /** * 购课学币数量。 */ + @ApiModelProperty(value = "购课学币数量", required = true) @NotNull(message = "数据验证失败，购课学币数量不能为空！", groups = {UpdateGroup.class}) private Integer buyCourseAmount; /** * 购买课程次数。 */ + @ApiModelProperty(value = "购买课程次数", required = true) @NotNull(message = "数据验证失败，购买课程次数不能为空！", groups = {UpdateGroup.class}) private Integer buyCourseCount; /** * 购买视频学币数量。 */ + @ApiModelProperty(value = "购买视频学币数量", required = true) @NotNull(message = "数据验证失败，购买视频学币数量不能为空！", groups = {UpdateGroup.class}) private Integer buyVideoAmount; /** * 购买视频次数。 */ + @ApiModelProperty(value = "购买视频次数", required = true) @NotNull(message = "数据验证失败，购买视频次数不能为空！", groups = {UpdateGroup.class}) private Integer buyVideoCount; /** * 购买作业学币数量。 */ + @ApiModelProperty(value = "购买作业学币数量", required = true) @NotNull(message = "数据验证失败，购买作业学币数量不能为空！", groups = {UpdateGroup.class}) private Integer buyPaperAmount; /** * 购买作业次数。 */ + @ApiModelProperty(value = "购买作业次数", required = true) @NotNull(message = "数据验证失败，购买作业次数不能为空！", groups = {UpdateGroup.class}) private Integer buyPaperCount; /** * 购买献花数量。 */ + @ApiModelProperty(value = "购买献花数量", required = true) @NotNull(message = "数据验证失败，购买献花数量不能为空！", groups = {UpdateGroup.class}) private Integer buyFlowerAmount; /** * 购买献花次数。 */ + @ApiModelProperty(value = "购买献花次数", required = true) @NotNull(message = "数据验证失败，购买献花次数不能为空！", groups = {UpdateGroup.class}) private Integer buyFlowerCount; /** * 充值学币数量。 */ + @ApiModelProperty(value = "充值学币数量", required = true) @NotNull(message = "数据验证失败，充值学币数量不能为空！", groups = {UpdateGroup.class}) private Integer rechargeCoinAmount; /** * 充值学币次数。 */ + @ApiModelProperty(value = "充值学币次数", required = true) @NotNull(message = "数据验证失败，充值学币次数不能为空！", groups = {UpdateGroup.class}) private Integer rechargeCoinCount; /** * 线下课程上课次数。 */ + @ApiModelProperty(value = "线下课程上课次数", required = true) @NotNull(message = "数据验证失败，线下课程上课次数不能为空！") private Integer doCourseCount; /** * 观看视频次数。 */ + @ApiModelProperty(value = "观看视频次数", required = true) @NotNull(message = "数据验证失败，观看视频次数不能为空！", groups = {UpdateGroup.class}) private Integer watchVideoCount; /** * 购买献花消费学币数量。 */ + @ApiModelProperty(value = "购买献花消费学币数量", required = true) @NotNull(message = "数据验证失败，购买献花消费学币数量不能为空！") private Integer watchVideoTotalSecond; /** * 做题数量。 */ + @ApiModelProperty(value = "做题数量", required = true) @NotNull(message = "数据验证失败，做题数量不能为空！", groups = {UpdateGroup.class}) private Integer doExerciseCount; /** * 做题正确的数量。 */ + @ApiModelProperty(value = "做题正确的数量", required = true) @NotNull(message = "数据验证失败，做题正确的数量不能为空！", groups = {UpdateGroup.class}) private Integer doExerciseCorrectCount; /** * statsDate 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "statsDate 范围过滤起始值(>=)") private String statsDateStart; /** * statsDate 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "statsDate 范围过滤结束值(<=)") private String statsDateEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionTransDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java similarity index 61% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionTransDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java index 55cf8dec..c4bdef93 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentActionTransDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java @@ -1,10 +1,12 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.application.common.constant.StudentActionType; -import com.orange.demo.application.common.constant.DeviceType; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.application.common.constant.StudentActionType; +import com.orangeforms.application.common.constant.DeviceType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -17,42 +19,49 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentActionTransDto对象") @Data public class StudentActionTransDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id", required = true) @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class}) private Long transId; /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id", required = true) @NotNull(message = "数据验证失败，学生Id不能为空！") private Long studentId; /** * 学生名称。 */ + @ApiModelProperty(value = "学生名称", required = true) @NotBlank(message = "数据验证失败，学生名称不能为空！") private String studentName; /** * 学生校区。 */ + @ApiModelProperty(value = "学生校区", required = true) @NotNull(message = "数据验证失败，学生校区不能为空！") private Long schoolId; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id", required = true) @NotNull(message = "数据验证失败，学生年级不能为空！") private Integer gradeId; /** * 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。 */ + @ApiModelProperty(value = "行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)", required = true) @NotNull(message = "数据验证失败，行为类型不能为空！") @ConstDictRef(constDictClass = StudentActionType.class, message = "数据验证失败，行为类型为无效值！") private Integer actionType; @@ -60,6 +69,7 @@ public class StudentActionTransDto { /** * 设备类型(0: iOS 1: Android 2: PC)。 */ + @ApiModelProperty(value = "设备类型(0: iOS 1: Android 2: PC)", required = true) @NotNull(message = "数据验证失败，设备类型不能为空！") @ConstDictRef(constDictClass = DeviceType.class, message = "数据验证失败，设备类型为无效值！") private Integer deviceType; @@ -67,51 +77,60 @@ public class StudentActionTransDto { /** * 看视频秒数。 */ + @ApiModelProperty(value = "看视频秒数") private Integer watchVideoSeconds; /** * 购买献花数量。 */ + @ApiModelProperty(value = "购买献花数量") private Integer flowerCount; /** * 购买作业数量。 */ + @ApiModelProperty(value = "购买作业数量") private Integer paperCount; /** * 购买视频数量。 */ + @ApiModelProperty(value = "购买视频数量") private Integer videoCount; /** * 购买课程数量。 */ + @ApiModelProperty(value = "购买课程数量") private Integer courseCount; /** * 充值学币数量。 */ + @ApiModelProperty(value = "充值学币数量") private Integer coinCount; /** * 做题是否正确标记。 */ + @ApiModelProperty(value = "做题是否正确标记") private Integer exerciseCorrectFlag; /** * 发生时间。 */ - @NotNull(message = "数据验证失败，发生时间不能为空！") + @ApiModelProperty(value = "发生时间") private Date createTime; /** * createTime 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "createTime 范围过滤起始值(>=)") private String createTimeStart; /** * createTime 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "createTime 范围过滤结束值(<=)") private String createTimeEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentClassDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java similarity index 54% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentClassDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java index 291e4c56..9ff88f3e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentClassDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java @@ -1,56 +1,79 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.webadmin.app.model.constant.ClassLevel; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.webadmin.app.model.constant.ClassLevel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; +import java.util.Date; + /** * StudentClassDto对象。 * * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentClassDto对象") @Data public class StudentClassDto { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id", required = true) @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class}) private Long classId; /** * 班级名称。 */ + @ApiModelProperty(value = "班级名称", required = true) @NotBlank(message = "数据验证失败，班级名称不能为空！") private String className; /** * 学校Id。 */ + @ApiModelProperty(value = "学校Id", required = true) @NotNull(message = "数据验证失败，所属校区不能为空！") private Long schoolId; /** * 学生班长Id。 */ + @ApiModelProperty(value = "学生班长Id", required = true) @NotNull(message = "数据验证失败，学生班长不能为空！") private Long leaderId; /** * 已完成课时数量。 */ + @ApiModelProperty(value = "已完成课时数量", required = true) @NotNull(message = "数据验证失败，已完成课时不能为空！", groups = {UpdateGroup.class}) private Integer finishClassHour; /** * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。 */ + @ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)", required = true) @NotNull(message = "数据验证失败，班级级别不能为空！") @ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！") private Integer classLevel; + + /** + * 创建用户。 + */ + @ApiModelProperty(value = "创建用户") + private Long createUserId; + + /** + * 班级创建时间。 + */ + @ApiModelProperty(value = "班级创建时间") + private Date createTime; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java similarity index 62% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java index de956c59..fc8a812c 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dto/StudentDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java @@ -1,11 +1,13 @@ -package com.orange.demo.webadmin.app.dto; +package com.orangeforms.webadmin.app.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.application.common.constant.Gender; -import com.orange.demo.application.common.constant.ExpLevel; -import com.orange.demo.application.common.constant.StudentStatus; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.application.common.constant.Gender; +import com.orangeforms.application.common.constant.ExpLevel; +import com.orangeforms.application.common.constant.StudentStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -18,48 +20,56 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentDto对象") @Data public class StudentDto { /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id", required = true) @NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class}) private Long studentId; /** * 登录手机。 */ + @ApiModelProperty(value = "登录手机", required = true) @NotBlank(message = "数据验证失败，手机号码不能为空！") private String loginMobile; /** * 学生姓名。 */ + @ApiModelProperty(value = "学生姓名", required = true) @NotBlank(message = "数据验证失败，学生姓名不能为空！") private String studentName; /** * 所在省份Id。 */ + @ApiModelProperty(value = "所在省份Id", required = true) @NotNull(message = "数据验证失败，所在省份不能为空！") private Long provinceId; /** * 所在城市Id。 */ + @ApiModelProperty(value = "所在城市Id", required = true) @NotNull(message = "数据验证失败，所在城市不能为空！") private Long cityId; /** * 区县Id。 */ + @ApiModelProperty(value = "区县Id", required = true) @NotNull(message = "数据验证失败，所在区县不能为空！") private Long districtId; /** * 学生性别 (0: 女生 1: 男生)。 */ + @ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)", required = true) @NotNull(message = "数据验证失败，学生性别不能为空！") @ConstDictRef(constDictClass = Gender.class, message = "数据验证失败，学生性别为无效值！") private Integer gender; @@ -67,12 +77,14 @@ public class StudentDto { /** * 生日。 */ + @ApiModelProperty(value = "生日", required = true) @NotNull(message = "数据验证失败，出生日期不能为空！") private Date birthday; /** * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。 */ + @ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)", required = true) @NotNull(message = "数据验证失败，经验等级不能为空！") @ConstDictRef(constDictClass = ExpLevel.class, message = "数据验证失败，经验等级为无效值！") private Integer experienceLevel; @@ -80,29 +92,40 @@ public class StudentDto { /** * 总共充值学币数量。 */ + @ApiModelProperty(value = "总共充值学币数量", required = true) @NotNull(message = "数据验证失败，充值学币不能为空！", groups = {UpdateGroup.class}) private Integer totalCoin; /** * 可用学币数量。 */ + @ApiModelProperty(value = "可用学币数量") private Integer leftCoin; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id", required = true) @NotNull(message = "数据验证失败，年级不能为空！") private Integer gradeId; /** * 校区Id。 */ + @ApiModelProperty(value = "校区Id", required = true) @NotNull(message = "数据验证失败，所属校区不能为空！") private Long schoolId; + /** + * 注册时间。 + */ + @ApiModelProperty(value = "注册时间", required = true) + private Date registerTime; + /** * 学生状态 (0: 正常 1: 锁定 2: 注销)。 */ + @ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)", required = true) @NotNull(message = "数据验证失败，学生状态不能为空！", groups = {UpdateGroup.class}) @ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，学生状态为无效值！") private Integer status; @@ -110,25 +133,30 @@ public class StudentDto { /** * birthday 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "birthday 范围过滤起始值(>=)") private String birthdayStart; /** * birthday 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "birthday 范围过滤结束值(<=)") private String birthdayEnd; /** * registerTime 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "registerTime 范围过滤起始值(>=)") private String registerTimeStart; /** * registerTime 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "registerTime 范围过滤结束值(<=)") private String registerTimeEnd; /** * login_mobile / student_name LIKE搜索字符串。 */ + @ApiModelProperty(value = "LIKE模糊搜索字符串") private String searchString; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/AreaCode.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/AreaCode.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java index 106c4b18..312ac88e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/AreaCode.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassCourse.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassCourse.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java index 7b4b7ea6..0388bcba 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassCourse.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassStudent.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassStudent.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java index 4f982b78..de9b65e5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/ClassStudent.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Course.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Course.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java index d75ac2c7..863f0379 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Course.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java @@ -1,14 +1,12 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.webadmin.app.model.constant.CourseDifficult; -import com.orange.demo.application.common.constant.Subject; -import com.orange.demo.common.core.upload.UploadStoreTypeEnum; -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.webadmin.app.vo.CourseVo; +import com.orangeforms.webadmin.app.model.constant.CourseDifficult; +import com.orangeforms.application.common.constant.Subject; +import com.orangeforms.common.core.upload.UploadStoreTypeEnum; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.CourseVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; @@ -168,7 +166,7 @@ public class Course { * @param courseVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "classCourse", expression = "java(mapToBean(courseVo.getClassCourse(), com.orange.demo.webadmin.app.model.ClassCourse.class))") + @Mapping(target = "classCourse", expression = "java(mapToBean(courseVo.getClassCourse(), com.orangeforms.webadmin.app.model.ClassCourse.class))") @Override Course toModel(CourseVo courseVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/CourseTransStats.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/CourseTransStats.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java index f6777c01..f24cfd99 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/CourseTransStats.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java @@ -1,11 +1,10 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.application.common.constant.Subject; -import com.orange.demo.common.core.annotation.RelationDict; -import com.orange.demo.common.core.annotation.RelationConstDict; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.app.vo.CourseTransStatsVo; +import com.orangeforms.application.common.constant.Subject; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.CourseTransStatsVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Grade.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Grade.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java index 3c6335e0..d5467c4f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Grade.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/MaterialEdition.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/MaterialEdition.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java index 35fe7bd8..d4b28bb0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/MaterialEdition.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Student.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Student.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java index f25dcc7a..730f6770 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/Student.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java @@ -1,15 +1,14 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.webadmin.upms.model.SysDept; -import com.orange.demo.application.common.constant.Gender; -import com.orange.demo.application.common.constant.ExpLevel; -import com.orange.demo.application.common.constant.StudentStatus; -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.webadmin.app.vo.StudentVo; +import com.orangeforms.webadmin.upms.model.SysDept; +import com.orangeforms.application.common.constant.Gender; +import com.orangeforms.application.common.constant.ExpLevel; +import com.orangeforms.application.common.constant.StudentStatus; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.StudentVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionStats.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionStats.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java index 3c7811d4..8966bec0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionStats.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java @@ -1,9 +1,9 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.RelationDict; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.app.vo.StudentActionStatsVo; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.StudentActionStatsVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionTrans.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionTrans.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java index a315e2a4..f2471cd3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentActionTrans.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java @@ -1,13 +1,12 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.webadmin.upms.model.SysDept; -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.webadmin.app.vo.StudentActionTransVo; +import com.orangeforms.webadmin.upms.model.SysDept; +import com.orangeforms.application.common.constant.StudentActionType; +import com.orangeforms.application.common.constant.DeviceType; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.StudentActionTransVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentClass.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentClass.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java index c1a6691d..e90c8143 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/StudentClass.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java @@ -1,12 +1,11 @@ -package com.orange.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.webadmin.upms.model.SysDept; -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.webadmin.app.vo.StudentClassVo; +import com.orangeforms.webadmin.upms.model.SysDept; +import com.orangeforms.webadmin.app.model.constant.ClassLevel; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.app.vo.StudentClassVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassLevel.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassLevel.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java index d37bae64..00470cef 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassLevel.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model.constant; +package com.orangeforms.webadmin.app.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassStatus.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassStatus.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java index 5270be1a..a7f8bee7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/ClassStatus.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model.constant; +package com.orangeforms.webadmin.app.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/CourseDifficult.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/CourseDifficult.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java index 7b8f6239..3a9e36a2 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/model/constant/CourseDifficult.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.app.model.constant; +package com.orangeforms.webadmin.app.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/AreaCodeService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java similarity index 73% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/AreaCodeService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java index afc03c64..dbe2ae67 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/AreaCodeService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.common.core.base.service.IBaseDictService; -import com.orange.demo.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.base.service.IBaseDictService; +import com.orangeforms.webadmin.app.model.AreaCode; import java.util.Collection; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java similarity index 82% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java index 1a7f5884..beb74cfb 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java @@ -1,8 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; @@ -86,13 +85,4 @@ public interface CourseService extends IBaseService { * @return 查询结果集。 */ List getCourseListByClassId(Long classId, Course filter, String orderBy); - - /** - * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 - * - * @param course 最新数据对象。 - * @param originalCourse 原有数据对象。 - * @return 数据全部正确返回true，否则false。 - */ - CallResult verifyRelatedData(Course course, Course originalCourse); } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseTransStatsService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseTransStatsService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java index 43e9ca24..860cb3c9 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/CourseTransStatsService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/GradeService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java similarity index 51% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/GradeService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java index bd4bc33e..91bb133f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/GradeService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.common.core.base.service.IBaseDictService; -import com.orange.demo.webadmin.app.model.Grade; +import com.orangeforms.common.core.base.service.IBaseDictService; +import com.orangeforms.webadmin.app.model.Grade; /** * 年级字典数据操作服务接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionStatsService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionStatsService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java index 1c72bd0d..fb7c7202 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionStatsService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionTransService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java similarity index 77% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionTransService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java index 72725761..9c3d0fff 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentActionTransService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java @@ -1,8 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; @@ -66,13 +65,4 @@ public interface StudentActionTransService extends IBaseService getStudentActionTransListWithRelation(StudentActionTrans filter, String orderBy); - - /** - * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 - * - * @param studentActionTrans 最新数据对象。 - * @param originalStudentActionTrans 原有数据对象。 - * @return 数据全部正确返回true，否则false。 - */ - CallResult verifyRelatedData(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans); } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentClassService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentClassService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java index f0c8b57a..935b527c 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentClassService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java @@ -1,8 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; @@ -117,13 +116,4 @@ public interface StudentClassService extends IBaseService { * @return 成功返回true，否则false。 */ boolean removeClassStudent(Long classId, Long studentId); - - /** - * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 - * - * @param studentClass 最新数据对象。 - * @param originalStudentClass 原有数据对象。 - * @return 数据全部正确返回true，否则false。 - */ - CallResult verifyRelatedData(StudentClass studentClass, StudentClass originalStudentClass); } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java similarity index 82% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java index fd0559cb..1ab0df50 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/StudentService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java @@ -1,8 +1,7 @@ -package com.orange.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; @@ -86,13 +85,4 @@ public interface StudentService extends IBaseService { * @return 查询结果集。 */ List getStudentListByClassId(Long classId, Student filter, String orderBy); - - /** - * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 - * - * @param student 最新数据对象。 - * @param originalStudent 原有数据对象。 - * @return 数据全部正确返回true，否则false。 - */ - CallResult verifyRelatedData(Student student, Student originalStudent); } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java similarity index 74% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java index 46bc6f87..e4a61722 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java @@ -1,11 +1,11 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; -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 com.orangeforms.webadmin.app.service.AreaCodeService; +import com.orangeforms.webadmin.app.dao.AreaCodeMapper; +import com.orangeforms.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.cache.MapTreeDictionaryCache; +import com.orangeforms.common.core.base.service.BaseDictService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java index 8058d603..6de626c7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java @@ -1,17 +1,17 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.webadmin.app.service.*; -import com.orange.demo.webadmin.app.dao.*; -import com.orange.demo.webadmin.app.model.*; -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.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseTransStatsServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseTransStatsServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java index 5773b114..6aae014a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/CourseTransStatsServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java @@ -1,11 +1,11 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; -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.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.base.service.BaseService; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/GradeServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java similarity index 71% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/GradeServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java index 30c6a229..4c5f45cf 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/GradeServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java @@ -1,11 +1,11 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.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.webadmin.app.service.GradeService; -import com.orange.demo.webadmin.app.dao.GradeMapper; -import com.orange.demo.webadmin.app.model.Grade; +import com.orangeforms.common.core.base.service.BaseDictService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.redis.cache.RedisDictionaryCache; +import com.orangeforms.webadmin.app.service.GradeService; +import com.orangeforms.webadmin.app.dao.GradeMapper; +import com.orangeforms.webadmin.app.model.Grade; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionStatsServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionStatsServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java index c5905173..709c810f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionStatsServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java @@ -1,11 +1,11 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; -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.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.base.service.BaseService; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionTransServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionTransServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java index e49dd8ef..ad76b07c 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentActionTransServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java @@ -1,16 +1,16 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.webadmin.app.service.*; -import com.orange.demo.webadmin.app.dao.*; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.webadmin.upms.service.SysDeptService; -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.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.upms.service.SysDeptService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentClassServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentClassServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java index a6f92da8..9f6b8286 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentClassServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java @@ -1,20 +1,20 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.webadmin.app.service.*; -import com.orange.demo.webadmin.app.dao.*; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.webadmin.upms.service.SysDeptService; -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; -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.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.upms.service.SysDeptService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java index 304ad3b4..a7f054cd 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/service/impl/StudentServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java @@ -1,19 +1,19 @@ -package com.orange.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.application.common.constant.StudentStatus; -import com.orange.demo.webadmin.app.service.*; -import com.orange.demo.webadmin.app.dao.*; -import com.orange.demo.webadmin.app.model.*; -import com.orange.demo.webadmin.upms.service.SysDeptService; -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.orangeforms.application.common.constant.StudentStatus; +import com.orangeforms.webadmin.app.service.*; +import com.orangeforms.webadmin.app.dao.*; +import com.orangeforms.webadmin.app.model.*; +import com.orangeforms.webadmin.upms.service.SysDeptService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/AreaCodeVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java similarity index 54% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/AreaCodeVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java index caead80f..e23c529e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/AreaCodeVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,26 +10,31 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("行政区划实体对象") @Data public class AreaCodeVo { /** * 行政区划主键Id */ + @ApiModelProperty(value = "行政区划主键Id", required = true) private Long areaId; /** * 行政区划名称 */ + @ApiModelProperty(value = "行政区划名称") private String areaName; /** * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别) */ + @ApiModelProperty(value = "行政区划级别") private Integer areaLevel; /** * 父级行政区划Id */ + @ApiModelProperty(value = "父级行政区划Id") private Long parentId; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassCourseVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java similarity index 52% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassCourseVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java index 71379034..f0d5a7f2 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassCourseVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,21 +10,25 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("ClassCourseVO视图对象") @Data public class ClassCourseVo { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id") private Long classId; /** * 课程Id。 */ + @ApiModelProperty(value = "课程Id") private Long courseId; /** * 课程顺序(数值越小越靠前)。 */ + @ApiModelProperty(value = "课程顺序(数值越小越靠前)") private Integer courseOrder; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassStudentVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java similarity index 51% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassStudentVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java index 5b42a33e..bd553ca1 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/ClassStudentVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,16 +10,19 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("ClassStudentVO视图对象") @Data public class ClassStudentVo { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id") private Long classId; /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id") private Long studentId; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseTransStatsVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseTransStatsVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java index 3888145d..7c6a61e3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseTransStatsVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,66 +13,79 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("CourseTransStatsVO视图对象") @Data public class CourseTransStatsVo { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Long statsId; /** * 统计日期。 */ + @ApiModelProperty(value = "统计日期") private Date statsDate; /** * 科目Id。 */ + @ApiModelProperty(value = "科目Id") private Integer subjectId; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id") private Integer gradeId; /** * 年级名称。 */ + @ApiModelProperty(value = "年级名称") private String gradeName; /** * 课程Id。 */ + @ApiModelProperty(value = "课程Id") private Long courseId; /** * 课程名称。 */ + @ApiModelProperty(value = "课程名称") private String courseName; /** * 学生上课次数。 */ + @ApiModelProperty(value = "学生上课次数") private Integer studentAttendCount; /** * 学生献花数量。 */ + @ApiModelProperty(value = "学生献花数量") private Integer studentFlowerAmount; /** * 学生献花次数。 */ + @ApiModelProperty(value = "学生献花次数") private Integer studentFlowerCount; /** * gradeId 字典关联数据。 */ + @ApiModelProperty(value = "gradeId 字典关联数据") private Map gradeIdDictMap; /** * subjectId 常量字典关联数据。 */ + @ApiModelProperty(value = "subjectId 常量字典关联数据") private Map subjectIdDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java index d9c15474..e39d8432 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/CourseVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -12,86 +14,103 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("CourseVO视图对象") @Data public class CourseVo { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Long courseId; /** * 课程名称。 */ + @ApiModelProperty(value = "课程名称") private String courseName; /** * 课程价格。 */ + @ApiModelProperty(value = "课程价格") private BigDecimal price; /** * 课程描述。 */ + @ApiModelProperty(value = "课程描述") private String description; /** * 课程难度(0: 容易 1: 普通 2: 很难)。 */ + @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)") private Integer difficulty; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id") private Integer gradeId; /** * 学科Id。 */ + @ApiModelProperty(value = "学科Id") private Integer subjectId; /** * 课时数量。 */ + @ApiModelProperty(value = "课时数量") private Integer classHour; /** * 多张课程图片地址。 */ + @ApiModelProperty(value = "多张课程图片地址") private String pictureUrl; /** * 创建用户Id。 */ + @ApiModelProperty(value = "创建用户Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 最后修改时间。 */ + @ApiModelProperty(value = "最后修改时间") private Date updateTime; /** * courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo。 */ + @ApiModelProperty(value = "courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo") private Map classCourse; /** * gradeId 字典关联数据。 */ + @ApiModelProperty(value = "gradeId 字典关联数据") private Map gradeIdDictMap; /** * difficulty 常量字典关联数据。 */ + @ApiModelProperty(value = "difficulty 常量字典关联数据") private Map difficultyDictMap; /** * subjectId 常量字典关联数据。 */ + @ApiModelProperty(value = "subjectId 常量字典关联数据") private Map subjectIdDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/GradeVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/GradeVo.java similarity index 51% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/GradeVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/GradeVo.java index 597b1a10..b5268294 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/GradeVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/GradeVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,16 +10,19 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("GradeVO视图对象") @Data public class GradeVo { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Integer gradeId; /** * 年级名称。 */ + @ApiModelProperty(value = "年级名称") private String gradeName; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionStatsVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionStatsVo.java similarity index 60% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionStatsVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionStatsVo.java index 6c79f4e2..22e19708 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionStatsVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionStatsVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,126 +13,151 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentActionStatsVO视图对象") @Data public class StudentActionStatsVo { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Long statsId; /** * 统计日期。 */ + @ApiModelProperty(value = "统计日期") private Date statsDate; /** * 统计小时。 */ + @ApiModelProperty(value = "统计小时") private Date statsMonth; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id") private Integer gradeId; /** * 学生所在省Id。 */ + @ApiModelProperty(value = "学生所在省Id") private Long provinceId; /** * 学生所在城市Id。 */ + @ApiModelProperty(value = "学生所在城市Id") private Long cityId; /** * 购课学币数量。 */ + @ApiModelProperty(value = "购课学币数量") private Integer buyCourseAmount; /** * 购买课程次数。 */ + @ApiModelProperty(value = "购买课程次数") private Integer buyCourseCount; /** * 购买视频学币数量。 */ + @ApiModelProperty(value = "购买视频学币数量") private Integer buyVideoAmount; /** * 购买视频次数。 */ + @ApiModelProperty(value = "购买视频次数") private Integer buyVideoCount; /** * 购买作业学币数量。 */ + @ApiModelProperty(value = "购买作业学币数量") private Integer buyPaperAmount; /** * 购买作业次数。 */ + @ApiModelProperty(value = "购买作业次数") private Integer buyPaperCount; /** * 购买献花数量。 */ + @ApiModelProperty(value = "购买献花数量") private Integer buyFlowerAmount; /** * 购买献花次数。 */ + @ApiModelProperty(value = "购买献花次数") private Integer buyFlowerCount; /** * 充值学币数量。 */ + @ApiModelProperty(value = "充值学币数量") private Integer rechargeCoinAmount; /** * 充值学币次数。 */ + @ApiModelProperty(value = "充值学币次数") private Integer rechargeCoinCount; /** * 线下课程上课次数。 */ + @ApiModelProperty(value = "线下课程上课次数") private Integer doCourseCount; /** * 观看视频次数。 */ + @ApiModelProperty(value = "观看视频次数") private Integer watchVideoCount; /** * 购买献花消费学币数量。 */ + @ApiModelProperty(value = "购买献花消费学币数量") private Integer watchVideoTotalSecond; /** * 做题数量。 */ + @ApiModelProperty(value = "做题数量") private Integer doExerciseCount; /** * 做题正确的数量。 */ + @ApiModelProperty(value = "做题正确的数量") private Integer doExerciseCorrectCount; /** * gradeId 字典关联数据。 */ + @ApiModelProperty(value = "gradeId 字典关联数据") private Map gradeIdDictMap; /** * provinceId 字典关联数据。 */ + @ApiModelProperty(value = "provinceId 字典关联数据") private Map provinceIdDictMap; /** * cityId 字典关联数据。 */ + @ApiModelProperty(value = "cityId 字典关联数据") private Map cityIdDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionTransVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionTransVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionTransVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionTransVo.java index 6dc1ccc0..0f525ded 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentActionTransVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionTransVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,101 +13,121 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentActionTransVO视图对象") @Data public class StudentActionTransVo { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Long transId; /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id") private Long studentId; /** * 学生名称。 */ + @ApiModelProperty(value = "学生名称") private String studentName; /** * 学生校区。 */ + @ApiModelProperty(value = "学生校区") private Long schoolId; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id") private Integer gradeId; /** * 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。 */ + @ApiModelProperty(value = "行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)") private Integer actionType; /** * 设备类型(0: iOS 1: Android 2: PC)。 */ + @ApiModelProperty(value = "设备类型(0: iOS 1: Android 2: PC)") private Integer deviceType; /** * 看视频秒数。 */ + @ApiModelProperty(value = "看视频秒数") private Integer watchVideoSeconds; /** * 购买献花数量。 */ + @ApiModelProperty(value = "购买献花数量") private Integer flowerCount; /** * 购买作业数量。 */ + @ApiModelProperty(value = "购买作业数量") private Integer paperCount; /** * 购买视频数量。 */ + @ApiModelProperty(value = "购买视频数量") private Integer videoCount; /** * 购买课程数量。 */ + @ApiModelProperty(value = "购买课程数量") private Integer courseCount; /** * 充值学币数量。 */ + @ApiModelProperty(value = "充值学币数量") private Integer coinCount; /** * 做题是否正确标记。 */ + @ApiModelProperty(value = "做题是否正确标记") private Integer exerciseCorrectFlag; /** * 发生时间。 */ + @ApiModelProperty(value = "发生时间") private Date createTime; /** * schoolId 字典关联数据。 */ + @ApiModelProperty(value = "schoolId 字典关联数据") private Map schoolIdDictMap; /** * gradeId 字典关联数据。 */ + @ApiModelProperty(value = "gradeId 字典关联数据") private Map gradeIdDictMap; /** * actionType 常量字典关联数据。 */ + @ApiModelProperty(value = "actionType 常量字典关联数据") private Map actionTypeDictMap; /** * deviceType 常量字典关联数据。 */ + @ApiModelProperty(value = "deviceType 常量字典关联数据") private Map deviceTypeDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentClassVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentClassVo.java similarity index 58% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentClassVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentClassVo.java index d64a595c..f0a8db4a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentClassVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentClassVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,61 +13,73 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentClassVO视图对象") @Data public class StudentClassVo { /** * 班级Id。 */ + @ApiModelProperty(value = "班级Id") private Long classId; /** * 班级名称。 */ + @ApiModelProperty(value = "班级名称") private String className; /** * 学校Id。 */ + @ApiModelProperty(value = "学校Id") private Long schoolId; /** * 学生班长Id。 */ + @ApiModelProperty(value = "学生班长Id") private Long leaderId; /** * 已完成课时数量。 */ + @ApiModelProperty(value = "已完成课时数量") private Integer finishClassHour; /** * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。 */ + @ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)") private Integer classLevel; /** * 创建用户。 */ + @ApiModelProperty(value = "创建用户") private Long createUserId; /** * 班级创建时间。 */ + @ApiModelProperty(value = "班级创建时间") private Date createTime; /** * schoolId 字典关联数据。 */ + @ApiModelProperty(value = "schoolId 字典关联数据") private Map schoolIdDictMap; /** * leaderId 字典关联数据。 */ + @ApiModelProperty(value = "leaderId 字典关联数据") private Map leaderIdDictMap; /** * classLevel 常量字典关联数据。 */ + @ApiModelProperty(value = "classLevel 常量字典关联数据") private Map classLevelDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentVo.java index f935e004..88d6f3e5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/vo/StudentVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,121 +13,145 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@ApiModel("StudentVO视图对象") @Data public class StudentVo { /** * 学生Id。 */ + @ApiModelProperty(value = "学生Id") private Long studentId; /** * 登录手机。 */ + @ApiModelProperty(value = "登录手机") private String loginMobile; /** * 学生姓名。 */ + @ApiModelProperty(value = "学生姓名") private String studentName; /** * 所在省份Id。 */ + @ApiModelProperty(value = "所在省份Id") private Long provinceId; /** * 所在城市Id。 */ + @ApiModelProperty(value = "所在城市Id") private Long cityId; /** * 区县Id。 */ + @ApiModelProperty(value = "区县Id") private Long districtId; /** * 学生性别 (0: 女生 1: 男生)。 */ + @ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)") private Integer gender; /** * 生日。 */ + @ApiModelProperty(value = "生日") private Date birthday; /** * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。 */ + @ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)") private Integer experienceLevel; /** * 总共充值学币数量。 */ + @ApiModelProperty(value = "总共充值学币数量") private Integer totalCoin; /** * 可用学币数量。 */ + @ApiModelProperty(value = "可用学币数量") private Integer leftCoin; /** * 年级Id。 */ + @ApiModelProperty(value = "年级Id") private Integer gradeId; /** * 校区Id。 */ + @ApiModelProperty(value = "校区Id") private Long schoolId; /** * 注册时间。 */ + @ApiModelProperty(value = "注册时间") private Date registerTime; /** * 学生状态 (0: 正常 1: 锁定 2: 注销)。 */ + @ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)") private Integer status; /** * provinceId 字典关联数据。 */ + @ApiModelProperty(value = "provinceId 字典关联数据") private Map provinceIdDictMap; /** * cityId 字典关联数据。 */ + @ApiModelProperty(value = "cityId 字典关联数据") private Map cityIdDictMap; /** * districtId 字典关联数据。 */ + @ApiModelProperty(value = "districtId 字典关联数据") private Map districtIdDictMap; /** * gradeId 字典关联数据。 */ + @ApiModelProperty(value = "gradeId 字典关联数据") private Map gradeIdDictMap; /** * schoolId 字典关联数据。 */ + @ApiModelProperty(value = "schoolId 字典关联数据") private Map schoolIdDictMap; /** * gender 常量字典关联数据。 */ + @ApiModelProperty(value = "gender 常量字典关联数据") private Map genderDictMap; /** * experienceLevel 常量字典关联数据。 */ + @ApiModelProperty(value = "experienceLevel 常量字典关联数据") private Map experienceLevelDictMap; /** * status 常量字典关联数据。 */ + @ApiModelProperty(value = "status 常量字典关联数据") private Map statusDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/ApplicationConfig.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/ApplicationConfig.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java index c54cbfc7..38338776 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/ApplicationConfig.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.config; +package com.orangeforms.webadmin.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/DataSourceConfig.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceConfig.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/DataSourceConfig.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceConfig.java index a28bad7d..772465b2 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/DataSourceConfig.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.config; +package com.orangeforms.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.webadmin.*.dao", "com.orange.demo.common.*.dao"}) +@MapperScan(value = {"com.orangeforms.webadmin.*.dao", "com.orangeforms.common.*.dao"}) public class DataSourceConfig { @Bean(initMethod = "init", destroyMethod = "close") diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/FilterConfig.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/FilterConfig.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java index 4c7f33c6..b44e84fe 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/FilterConfig.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.config; +package com.orangeforms.webadmin.config; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/InterceptorConfig.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/InterceptorConfig.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java index a6765b9e..e631d318 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/config/InterceptorConfig.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java @@ -1,6 +1,6 @@ -package com.orange.demo.webadmin.config; +package com.orangeforms.webadmin.config; -import com.orange.demo.webadmin.interceptor.AuthenticationInterceptor; +import com.orangeforms.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; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/interceptor/AuthenticationInterceptor.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/interceptor/AuthenticationInterceptor.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java index f70cda2f..51d28f0f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/interceptor/AuthenticationInterceptor.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java @@ -1,17 +1,17 @@ -package com.orange.demo.webadmin.interceptor; +package com.orangeforms.webadmin.interceptor; import com.alibaba.fastjson.JSON; -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; -import com.orange.demo.common.core.object.TokenData; -import com.orange.demo.common.core.util.ApplicationContextHolder; -import com.orange.demo.common.core.util.JwtUtil; -import com.orange.demo.common.core.util.RedisKeyUtil; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.webadmin.upms.service.SysPermWhitelistService; +import com.orangeforms.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.annotation.NoAuthInterface; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.core.util.JwtUtil; +import com.orangeforms.common.core.util.RedisKeyUtil; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java similarity index 80% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java index 5d670e0f..9bee621d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java @@ -1,23 +1,29 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import lombok.extern.slf4j.Slf4j; -import com.orange.demo.webadmin.config.ApplicationConfig; -import com.orange.demo.webadmin.upms.service.*; -import com.orange.demo.webadmin.upms.model.*; -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; -import com.orange.demo.common.core.constant.ErrorCodeEnum; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.*; -import com.orange.demo.common.redis.cache.SessionCacheHelper; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.webadmin.upms.model.constant.SysUserType; +import com.orangeforms.common.core.annotation.NoAuthInterface; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.redis.cache.SessionCacheHelper; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +34,7 @@ import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * 登录接口控制器类。 @@ -35,6 +42,8 @@ import java.util.concurrent.TimeUnit; * @author Jerry * @date 2020-09-24 */ +@ApiSupport(order = 1) +@Api(tags = "用户登录接口") @Slf4j @RestController @RequestMapping("/admin/upms/login") @@ -49,6 +58,8 @@ public class LoginController { @Autowired private SysPermService sysPermService; @Autowired + private SysRoleService sysRoleService; + @Autowired private SysDataPermService sysDataPermService; @Autowired private ApplicationConfig appConfig; @@ -66,6 +77,12 @@ public class LoginController { * @param password 密码。 * @return 应答结果对象，其中包括JWT的Token数据，以及菜单列表。 */ + @ApiImplicitParams({ + // 这里包含密码密文，仅用于方便开发期间的接口测试，集成测试和发布阶段，需要将当前注解去掉。 + // 如果您重新生成了公钥和私钥，请替换password的缺省值。 + @ApiImplicitParam(name = "loginName", defaultValue = "admin"), + @ApiImplicitParam(name = "password", defaultValue = "IP3ccke3GhH45iGHB5qP9p7iZw6xUyj28Ju10rnBiPKOI35sc%2BjI7%2FdsjOkHWMfUwGYGfz8ik31HC2Ruk%2Fhkd9f6RPULTHj7VpFdNdde2P9M4mQQnFBAiPM7VT9iW3RyCtPlJexQ3nAiA09OqG%2F0sIf1kcyveSrulxembARDbDo%3D") + }) @NoAuthInterface @OperationLog(type = SysOperationLogType.LOGIN, saveResponse = false) @PostMapping("/doLogin") @@ -191,6 +208,11 @@ public class LoginController { tokenData.setLoginIp(IpUtil.getRemoteIpAddress(ContextUtil.getHttpRequest())); tokenData.setLoginTime(new Date()); tokenData.setDeviceType(deviceType); + List userRoleList = sysRoleService.getSysUserRoleListByUserId(user.getUserId()); + if (CollectionUtils.isNotEmpty(userRoleList)) { + Set userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet()); + tokenData.setRoleIds(StringUtils.join(userRoleIdSet, ",")); + } String sessionIdKey = RedisKeyUtil.makeSessionIdKey(sessionId); String sessionData = JSON.toJSONString(tokenData, SerializerFeature.WriteNonStringValueAsString); RBucket bucket = redissonClient.getBucket(sessionIdKey); diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginUserController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginUserController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java index 7c8d7326..edf22342 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/LoginUserController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java @@ -1,11 +1,12 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.RedisKeyUtil; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.RedisKeyUtil; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; @@ -22,6 +23,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "在线用户接口") @Slf4j @RestController @RequestMapping("/admin/upms/loginUser") diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDataPermController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDataPermController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java index 444ee64b..f467f3f2 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDataPermController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java @@ -1,24 +1,26 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -import com.orange.demo.webadmin.upms.dto.SysDataPermDto; -import com.orange.demo.webadmin.upms.dto.SysUserDto; -import com.orange.demo.webadmin.upms.vo.SysDataPermVo; -import com.orange.demo.webadmin.upms.vo.SysUserVo; -import com.orange.demo.webadmin.upms.model.SysDataPerm; -import com.orange.demo.webadmin.upms.model.SysUser; -import com.orange.demo.webadmin.upms.service.SysDataPermService; -import com.orange.demo.webadmin.upms.service.SysUserService; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.constant.ErrorCodeEnum; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.*; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysDataPermDto; +import com.orangeforms.webadmin.upms.dto.SysUserDto; +import com.orangeforms.webadmin.upms.vo.SysDataPermVo; +import com.orangeforms.webadmin.upms.vo.SysUserVo; +import com.orangeforms.webadmin.upms.model.SysDataPerm; +import com.orangeforms.webadmin.upms.model.SysUser; +import com.orangeforms.webadmin.upms.service.SysDataPermService; +import com.orangeforms.webadmin.upms.service.SysUserService; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,6 +34,7 @@ import java.util.stream.Collectors; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "数据权限管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysDataPerm") @@ -49,6 +52,11 @@ public class SysDataPermController { * @param deptIdListString 数据权限关联的部门Id列表，多个之间逗号分隔。 * @return 应答结果对象。包含新增数据权限对象的主键Id。 */ + @ApiOperationSupport(ignoreParameters = { + "sysDataPermDto.dataPermId", + "sysDataPermDto.createTimeStart", + "sysDataPermDto.createTimeEnd", + "sysDataPermDto.searchString"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add( @@ -77,6 +85,10 @@ public class SysDataPermController { * @param deptIdListString 数据权限关联的部门Id列表，多个之间逗号分隔。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = { + "sysDataPermDto.createTimeStart", + "sysDataPermDto.createTimeEnd", + "sysDataPermDto.searchString"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update( diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDeptController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDeptController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java index ae1bc8ba..807dfa82 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysDeptController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java @@ -1,17 +1,19 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.jimmyshi.beanquery.BeanQuery; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -import com.orange.demo.webadmin.upms.vo.*; -import com.orange.demo.webadmin.upms.dto.*; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.webadmin.upms.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.orangeforms.webadmin.upms.vo.*; +import com.orangeforms.webadmin.upms.dto.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +27,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "部门管理管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysDept") @@ -39,6 +42,7 @@ public class SysDeptController { * @param sysDeptDto 新增对象。 * @return 应答结果对象，包含新增对象主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysDeptDto.deptId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody SysDeptDto sysDeptDto) { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysMenuController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysMenuController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java index 57414b50..a24df784 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysMenuController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java @@ -1,20 +1,22 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.TypeReference; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; -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.model.constant.SysMenuType; -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.*; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysMenuDto; +import com.orangeforms.webadmin.upms.vo.SysMenuVo; +import com.orangeforms.webadmin.upms.model.SysMenu; +import com.orangeforms.webadmin.upms.model.constant.SysMenuType; +import com.orangeforms.webadmin.upms.service.SysMenuService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,6 +29,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "菜单管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysMenu") @@ -42,6 +45,7 @@ public class SysMenuController { * @param permCodeIdListString 与当前菜单Id绑定的权限Id列表，多个权限之间逗号分隔。 * @return 应答结果对象，包含新增菜单的主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysMenuDto.menuId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add( diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysOperationLogController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysOperationLogController.java similarity index 77% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysOperationLogController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysOperationLogController.java index 23918ed6..4dd693a0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysOperationLogController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysOperationLogController.java @@ -1,15 +1,16 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.util.MyPageUtil; -import com.orange.demo.common.log.model.SysOperationLog; -import com.orange.demo.common.log.service.SysOperationLogService; -import com.orange.demo.webadmin.upms.dto.SysOperationLogDto; -import com.orange.demo.webadmin.upms.vo.SysOperationLogVo; +import io.swagger.annotations.Api; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.log.model.SysOperationLog; +import com.orangeforms.common.log.service.SysOperationLogService; +import com.orangeforms.webadmin.upms.dto.SysOperationLogDto; +import com.orangeforms.webadmin.upms.vo.SysOperationLogVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +23,7 @@ import java.util.List; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "操作日志接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysOperationLog") diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermCodeController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermCodeController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java index 8542dabb..83883715 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermCodeController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java @@ -1,18 +1,20 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import com.alibaba.fastjson.TypeReference; import lombok.extern.slf4j.Slf4j; -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.*; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysPermCodeDto; +import com.orangeforms.webadmin.upms.vo.SysPermCodeVo; +import com.orangeforms.webadmin.upms.model.SysPermCode; +import com.orangeforms.webadmin.upms.service.SysPermCodeService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; @@ -26,6 +28,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "权限字管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysPermCode") @@ -41,6 +44,7 @@ public class SysPermCodeController { * @param permIdListString 与当前权限Id绑定的权限资源Id列表，多个权限资源之间逗号分隔。 * @return 应答结果对象，包含新增权限字的主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysPermCodeDto.permCodeId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add( diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java index 8470868e..52207338 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java @@ -1,19 +1,21 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -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.*; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysPermDto; +import com.orangeforms.webadmin.upms.vo.SysPermVo; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,6 +29,7 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "权限资源管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysPerm") @@ -41,6 +44,7 @@ public class SysPermController { * @param sysPermDto 新增权限资源对象。 * @return 应答结果对象，包含新增权限资源的主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysPermDto.permId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody SysPermDto sysPermDto) { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermModuleController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermModuleController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java index 79a6b202..6e1a7a10 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysPermModuleController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java @@ -1,18 +1,20 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; -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.*; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysPermModuleDto; +import com.orangeforms.webadmin.upms.vo.SysPermModuleVo; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.model.SysPermModule; +import com.orangeforms.webadmin.upms.service.SysPermModuleService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +31,7 @@ import java.util.Map; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "权限资源模块管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysPermModule") @@ -43,6 +46,7 @@ public class SysPermModuleController { * @param sysPermModuleDto 新增权限资源模块对象。 * @return 应答结果对象，包含新增权限资源模块的主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysPermModuleDto.moduleId"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add(@MyRequestBody SysPermModuleDto sysPermModuleDto) { diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysRoleController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysRoleController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java index 17c39729..3c9b08df 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysRoleController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java @@ -1,25 +1,28 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import cn.jimmyshi.beanquery.BeanQuery; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -import com.orange.demo.webadmin.upms.dto.SysRoleDto; -import com.orange.demo.webadmin.upms.dto.SysUserDto; -import com.orange.demo.webadmin.upms.vo.SysRoleVo; -import com.orange.demo.webadmin.upms.vo.SysUserVo; -import com.orange.demo.webadmin.upms.model.SysRole; -import com.orange.demo.webadmin.upms.model.SysUser; -import com.orange.demo.webadmin.upms.model.SysUserRole; -import com.orange.demo.webadmin.upms.service.SysRoleService; -import com.orange.demo.webadmin.upms.service.SysUserService; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.constant.ErrorCodeEnum; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.*; -import com.orange.demo.common.core.annotation.MyRequestBody; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.webadmin.upms.dto.SysRoleDto; +import com.orangeforms.webadmin.upms.dto.SysUserDto; +import com.orangeforms.webadmin.upms.vo.SysRoleVo; +import com.orangeforms.webadmin.upms.vo.SysUserVo; +import com.orangeforms.webadmin.upms.model.SysRole; +import com.orangeforms.webadmin.upms.model.SysUser; +import com.orangeforms.webadmin.upms.model.SysUserRole; +import com.orangeforms.webadmin.upms.service.SysRoleService; +import com.orangeforms.webadmin.upms.service.SysUserService; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +36,7 @@ import java.util.stream.Collectors; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "角色管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysRole") @@ -50,6 +54,7 @@ public class SysRoleController { * @param menuIdListString 与当前角色Id绑定的menuId列表，多个menuId之间逗号分隔。 * @return 应答结果对象，包含新增角色的主键Id。 */ + @ApiOperationSupport(ignoreParameters = {"sysRoleDto.roleId", "sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add( @@ -78,6 +83,7 @@ public class SysRoleController { * @param menuIdListString 与当前角色Id绑定的menuId列表，多个menuId之间逗号分隔。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = {"sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update( @@ -292,6 +298,34 @@ public class SysRoleController { return ResponseResult.success(); } + /** + * 以字典形式返回全部角色管理数据集合。字典的键值为[roleId, roleName]。 + * 白名单接口，登录用户均可访问。 + * + * @param filter 过滤对象。 + * @return 应答结果对象，包含的数据为 List>，map中包含两条记录，key的值分别是id和name，value对应具体数据。 + */ + @GetMapping("/listDict") + public ResponseResult>> listDict(SysRole filter) { + List resultList = sysRoleService.getListByFilter(filter); + return ResponseResult.success(BeanQuery.select( + "roleId as id", "roleName as name").executeFrom(resultList)); + } + + /** + * 根据字典Id集合，获取查询后的字典数据。 + * + * @param dictIds 字典Id集合。 + * @return 应答结果对象，包含字典形式的数据集合。 + */ + @PostMapping("/listDictByIds") + public ResponseResult>> listDictByIds( + @MyRequestBody(elementType = Long.class) List dictIds) { + List resultList = sysRoleService.getInList(new HashSet<>(dictIds)); + return ResponseResult.success(BeanQuery.select( + "roleId as id", "roleName as name").executeFrom(resultList)); + } + /** * 查询角色的权限资源地址列表。同时返回详细的分配路径。 * diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysUserController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysUserController.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java index 60e18455..f2af5378 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/controller/SysUserController.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java @@ -1,19 +1,20 @@ -package com.orange.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.TypeReference; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import com.github.pagehelper.page.PageMethod; -import com.orange.demo.webadmin.upms.vo.*; -import com.orange.demo.webadmin.upms.dto.*; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.webadmin.upms.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.AddGroup; -import com.orange.demo.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.vo.*; +import com.orangeforms.webadmin.upms.dto.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +28,7 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@Api(tags = "用户管理管理接口") @Slf4j @RestController @RequestMapping("/admin/upms/sysUser") @@ -47,6 +49,10 @@ public class SysUserController { * @param roleIdListString 逗号分隔的角色Id列表。 * @return 应答结果对象，包含新增用户的主键Id。 */ + @ApiOperationSupport(ignoreParameters = { + "sysUserDto.userId", + "sysUserDto.createTimeStart", + "sysUserDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.ADD) @PostMapping("/add") public ResponseResult add( @@ -77,6 +83,9 @@ public class SysUserController { * @param roleIdListString 逗号分隔的角色Id列表。 * @return 应答结果对象。 */ + @ApiOperationSupport(ignoreParameters = { + "sysUserDto.createTimeStart", + "sysUserDto.createTimeEnd"}) @OperationLog(type = SysOperationLogType.UPDATE) @PostMapping("/update") public ResponseResult update( diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermDeptMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java similarity index 53% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermDeptMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java index 06158b1a..937b3be7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermDeptMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysDataPermDept; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPermDept; /** * 数据权限与部门关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java index c6b7a150..436ef1b1 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysDataPerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPerm; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermUserMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java similarity index 53% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermUserMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java index 72a63987..02d9590b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDataPermUserMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysDataPermUser; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPermUser; /** * 数据权限与用户关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java similarity index 82% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java index 12e8279e..65480287 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysDept; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDept; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptRelationMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptRelationMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java index 72e99c45..2abdc05e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysDeptRelationMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysDeptRelation; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDeptRelation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java index 82c0069f..b138a412 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysMenu; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysMenu; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java similarity index 53% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java index 55180d7a..5027e1b3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysMenuPermCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysMenuPermCode; /** * 菜单与权限字关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodeMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java index 7f0084cd..8ceb02fb 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodeMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysPermCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermCode; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodePermMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java similarity index 54% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodePermMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java index fdcd1552..0a4315ba 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermCodePermMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysPermCodePerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermCodePerm; /** * 权限字与权限资源关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java index 3226e64b..03cf75dd 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysPerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPerm; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermModuleMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java similarity index 71% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermModuleMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java index bbf426e7..9cca25d3 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermModuleMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysPermModule; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermModule; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermWhitelistMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java similarity index 53% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermWhitelistMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java index 0a7d186c..e0735e3b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysPermWhitelistMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; /** * 权限资源白名单数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java index 7721a325..4f2b6a99 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysRole; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysRole; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMenuMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java similarity index 54% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMenuMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java index 023aea30..ca3122b5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysRoleMenuMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysRoleMenu; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysRoleMenu; /** * 角色与菜单操作关联关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java index f05e2a05..55bd569d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysUser; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysUser; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserRoleMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java similarity index 53% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserRoleMapper.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java index 09bbceec..3b11da37 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/SysUserRoleMapper.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.model.SysUserRole; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysUserRole; /** * 用户与角色关联关系数据访问操作接口。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml similarity index 73% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml index 7bf01fb4..d3b228e6 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml similarity index 83% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml index cc580fe6..a7cebbe6 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -12,10 +12,10 @@ - + + ofType="com.orangeforms.webadmin.upms.model.SysDataPermDept" notNullColumn="dept_id" + resultMap="com.orangeforms.webadmin.upms.dao.SysDataPermDeptMapper.BaseResultMap"> @@ -29,10 +29,10 @@ AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString} - AND zz_sys_data_perm.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - SELECT zz_sys_data_perm.* FROM @@ -45,7 +45,7 @@ - SELECT zz_sys_data_perm.*, zz_sys_data_perm_dept.* diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml similarity index 73% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml index 6ff131d5..2530c39f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml index 7602ad35..ef63bdc9 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -41,8 +41,8 @@ - - AND zz_sys_dept.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_sys_dept.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -58,7 +58,7 @@ - SELECT * FROM zz_sys_dept diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml index a57ed88c..6dfc6df6 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml index 130e8f72..e6626e6b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -29,7 +29,7 @@ AND ur.user_id = #{userId} AND ur.role_id = rm.role_id AND rm.menu_id = m.menu_id - AND m.menu_type <= ${@com.orange.demo.webadmin.upms.model.constant.SysMenuType@TYPE_MENU} + AND m.menu_type <= ${@com.orangeforms.webadmin.upms.model.constant.SysMenuType@TYPE_MENU} ORDER BY m.show_order diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml similarity index 73% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml index 8e7076ed..f3c00688 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml similarity index 96% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml index eaa78572..37ab7fd0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml similarity index 73% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml index fe0ddcbc..2b35a883 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml similarity index 97% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml index 8f46923e..e5fc3aee 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml similarity index 80% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml index 4bf14eab..b5ae216d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -14,10 +14,10 @@ - + + ofType="com.orangeforms.webadmin.upms.model.SysPerm" notNullColumn="perm_id" + resultMap="com.orangeforms.webadmin.upms.dao.SysPermMapper.BaseResultMap"> @@ -34,9 +34,9 @@ FROM zz_sys_perm_module pm LEFT JOIN - zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - AND pm.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND pm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} ORDER BY pm.show_order, p.show_order diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml similarity index 77% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml index ade88e22..00d0c6d4 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml index 2e0fdb5c..950a176d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,10 +18,10 @@ AND role_name LIKE #{safeRoleName} - AND deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - SELECT * FROM zz_sys_role diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml similarity index 72% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml index c8b435a1..6bf30195 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml similarity index 96% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml index 4e0dbbff..17fc41cf 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -53,8 +53,8 @@ - - AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_sys_user.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -83,7 +83,7 @@ - SELECT * FROM zz_sys_user diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserRoleMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserRoleMapper.xml similarity index 72% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserRoleMapper.xml rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserRoleMapper.xml index e5b3dfab..c4993db0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dao/mapper/SysUserRoleMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserRoleMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java new file mode 100644 index 00000000..773d1d5f --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java @@ -0,0 +1,28 @@ +package com.orangeforms.webadmin.upms.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 数据权限与部门关联Dto。 + * + * @author Jerry + * @date 2020-09-24 + */ +@ApiModel("数据权限与部门关联Dto") +@Data +public class SysDataPermDeptDto { + + /** + * 数据权限Id。 + */ + @ApiModelProperty(value = "数据权限Id", required = true) + private Long dataPermId; + + /** + * 关联部门Id。 + */ + @ApiModelProperty(value = "关联部门Id", required = true) + private Long deptId; +} \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java similarity index 60% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java index 897bfe64..7a537c3e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java @@ -1,9 +1,11 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.common.datafilter.constant.DataPermRuleType; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.datafilter.constant.DataPermRuleType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -14,24 +16,28 @@ import javax.validation.constraints.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("数据权限Dto") @Data public class SysDataPermDto { /** * 数据权限Id。 */ + @ApiModelProperty(value = "数据权限Id", required = true) @NotNull(message = "数据权限Id不能为空！", groups = {UpdateGroup.class}) private Long dataPermId; /** * 显示名称。 */ + @ApiModelProperty(value = "显示名称", required = true) @NotBlank(message = "数据权限名称不能为空！") private String dataPermName; /** * 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。 */ + @ApiModelProperty(value = "数据权限规则类型", required = true) @NotNull(message = "数据权限规则类型不能为空！") @ConstDictRef(constDictClass = DataPermRuleType.class) private Integer ruleType; @@ -39,10 +45,12 @@ public class SysDataPermDto { /** * 部门Id列表(逗号分隔)。 */ + @ApiModelProperty(hidden = true) private String deptIdListString; /** * 搜索字符串。 */ + @ApiModelProperty(value = "LIKE 模糊搜索字符串") private String searchString; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java new file mode 100644 index 00000000..bdf8b2f5 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java @@ -0,0 +1,73 @@ +package com.orangeforms.webadmin.upms.dto; + +import com.orangeforms.common.core.validator.UpdateGroup; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.*; + +import java.util.Date; + +/** + * SysDeptDto对象。 + * + * @author Jerry + * @date 2020-09-24 + */ +@ApiModel("SysDeptDto对象") +@Data +public class SysDeptDto { + + /** + * 部门Id。 + */ + @ApiModelProperty(value = "部门Id", required = true) + @NotNull(message = "数据验证失败，部门Id不能为空！", groups = {UpdateGroup.class}) + private Long deptId; + + /** + * 部门名称。 + */ + @ApiModelProperty(value = "部门名称", required = true) + @NotBlank(message = "数据验证失败，部门名称不能为空！") + private String deptName; + + /** + * 显示顺序。 + */ + @ApiModelProperty(value = "显示顺序", required = true) + @NotNull(message = "数据验证失败，显示顺序不能为空！") + private Integer showOrder; + + /** + * 父部门Id。 + */ + @ApiModelProperty(value = "父部门Id") + private Long parentId; + + /** + * 创建者Id。 + */ + @ApiModelProperty(value = "创建者Id") + private Long createUserId; + + /** + * 更新者Id。 + */ + @ApiModelProperty(value = "更新者Id") + private Long updateUserId; + + /** + * 创建时间。 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新时间。 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysMenuDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java similarity index 62% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysMenuDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java index f01ee6f0..e8bcafa1 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysMenuDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java @@ -1,8 +1,10 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.webadmin.upms.model.constant.SysMenuType; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.webadmin.upms.model.constant.SysMenuType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull; * @author Jerry * @date 2020-09-24 */ +@ApiModel("菜单Dto") @Data public class SysMenuDto { /** * 菜单Id。 */ + @ApiModelProperty(value = "菜单Id", required = true) @NotNull(message = "菜单Id不能为空！", groups = {UpdateGroup.class}) private Long menuId; /** * 父菜单Id，目录菜单的父菜单为null */ + @ApiModelProperty(value = "父菜单Id") private Long parentId; /** * 菜单显示名称。 */ + @ApiModelProperty(value = "菜单显示名称", required = true) @NotBlank(message = "菜单显示名称不能为空！") private String menuName; /** * 菜单类型 (0: 目录 1: 菜单 2: 按钮 3: UI片段)。 */ + @ApiModelProperty(value = "菜单类型", required = true) @NotNull(message = "菜单类型不能为空！") @ConstDictRef(constDictClass = SysMenuType.class, message = "数据验证失败，菜单类型为无效值！") private Integer menuType; @@ -44,21 +51,25 @@ public class SysMenuDto { /** * 前端表单路由名称，仅用于menu_type为1的菜单类型。 */ + @ApiModelProperty(value = "前端表单路由名称") private String formRouterName; /** * 在线表单主键Id，仅用于在线表单绑定的菜单。 */ + @ApiModelProperty(value = "在线表单主键Id") private Long onlineFormId; /** * 菜单显示顺序 (值越小，排序越靠前)。 */ + @ApiModelProperty(value = "菜单显示顺序", required = true) @NotNull(message = "菜单显示顺序不能为空！") private Integer showOrder; /** * 菜单图标。 */ + @ApiModelProperty(value = "菜单显示顺序") private String icon; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysOperationLogDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysOperationLogDto.java similarity index 61% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysOperationLogDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysOperationLogDto.java index e0d50987..9aecccf5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysOperationLogDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysOperationLogDto.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,58 +10,69 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("操作日志Dto") @Data public class SysOperationLogDto { /** * 主键Id。 */ + @ApiModelProperty(value = "主键Id") private Long logId; /** * 操作类型。 * 常量值定义可参考SysOperationLogType对象。 */ + @ApiModelProperty(value = "操作类型") private Integer operationType; /** * 每次请求的Id。 * 对于微服务之间的调用，在同一个请求的调用链中，该值是相同的。 */ + @ApiModelProperty(value = "每次请求的Id") private String traceId; /** * HTTP 请求地址。 */ + @ApiModelProperty(value = "HTTP 请求地址") private String requestUrl; /** * 应答状态。 */ + @ApiModelProperty(value = "应答状态") private Boolean success; /** * 操作员名称。 */ + @ApiModelProperty(value = "操作员名称") private String operatorName; /** * 调用时长最小值。 */ + @ApiModelProperty(value = "调用时长最小值") private Long elapseMin; /** * 调用时长最大值。 */ + @ApiModelProperty(value = "调用时长最大值") private Long elapseMax; /** * 操作开始时间。 */ + @ApiModelProperty(value = "操作开始时间") private String operationTimeStart; /** * 操作开始时间。 */ + @ApiModelProperty(value = "操作开始时间") private String operationTimeEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermCodeDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java similarity index 62% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermCodeDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java index 354495e7..7111b6cd 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermCodeDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java @@ -1,8 +1,10 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.webadmin.upms.model.constant.SysPermCodeType; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.webadmin.upms.model.constant.SysPermCodeType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限字Dto") @Data public class SysPermCodeDto { /** * 权限字Id。 */ + @ApiModelProperty(value = "权限字Id", required = true) @NotNull(message = "权限字Id不能为空！", groups = {UpdateGroup.class}) private Long permCodeId; /** * 权限字标识(一般为有含义的英文字符串)。 */ + @ApiModelProperty(value = "权限字标识", required = true) @NotBlank(message = "权限字编码不能为空！") private String permCode; /** * 上级权限字Id。 */ + @ApiModelProperty(value = "上级权限字Id") private Long parentId; /** * 权限字类型(0: 表单 1: UI片段 2: 操作)。 */ + @ApiModelProperty(value = "权限字类型", required = true) @NotNull(message = "权限字类型不能为空！") @ConstDictRef(constDictClass = SysPermCodeType.class, message = "数据验证失败，权限类型为无效值！") private Integer permCodeType; @@ -44,12 +51,14 @@ public class SysPermCodeDto { /** * 显示名称。 */ + @ApiModelProperty(value = "显示名称", required = true) @NotBlank(message = "权限字显示名称不能为空！") private String showName; /** * 显示顺序(数值越小，越靠前)。 */ + @ApiModelProperty(value = "显示顺序", required = true) @NotNull(message = "权限字显示顺序不能为空！") private Integer showOrder; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java similarity index 63% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java index f5cc246e..d23d9c7b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java @@ -1,6 +1,8 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -12,41 +14,48 @@ import javax.validation.constraints.NotNull; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限资源Dto") @Data public class SysPermDto { /** * 权限资源Id。 */ + @ApiModelProperty(value = "权限资源Id", required = true) @NotNull(message = "权限Id不能为空！", groups = {UpdateGroup.class}) private Long permId; /** * 权限资源名称。 */ + @ApiModelProperty(value = "权限资源名称", required = true) @NotBlank(message = "权限资源名称不能为空！") private String permName; /** * shiro格式的权限字，如(upms:sysUser:add)。 */ + @ApiModelProperty(value = "权限字") private String permCode; /** * 权限所在的权限模块Id。 */ + @ApiModelProperty(value = "权限所在的权限模块Id") @NotNull(message = "权限模块Id不能为空！") private Long moduleId; /** * 关联的URL。 */ + @ApiModelProperty(value = "关联的URL", required = true) @NotBlank(message = "权限关联的url不能为空！") private String url; /** * 权限在当前模块下的顺序，由小到大。 */ + @ApiModelProperty(value = "显示顺序", required = true) @NotNull(message = "权限显示顺序不能为空！") private Integer showOrder; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermModuleDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java similarity index 61% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermModuleDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java index acb6929d..12b81888 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysPermModuleDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java @@ -1,8 +1,10 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.webadmin.upms.model.constant.SysPermModuleType; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.webadmin.upms.model.constant.SysPermModuleType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,29 +16,34 @@ import javax.validation.constraints.NotNull; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限资源模块Dto") @Data public class SysPermModuleDto { /** * 权限模块Id。 */ + @ApiModelProperty(value = "权限模块Id", required = true) @NotNull(message = "权限模块Id不能为空！", groups = {UpdateGroup.class}) private Long moduleId; /** * 权限模块名称。 */ + @ApiModelProperty(value = "权限模块名称", required = true) @NotBlank(message = "权限模块名称不能为空！") private String moduleName; /** * 上级权限模块Id。 */ + @ApiModelProperty(value = "上级权限模块Id") private Long parentId; /** * 权限模块类型(0: 普通模块 1: Controller模块)。 */ + @ApiModelProperty(value = "权限模块类型", required = true) @NotNull(message = "模块类型不能为空！") @ConstDictRef(constDictClass = SysPermModuleType.class, message = "数据验证失败，权限模块类型为无效值！") private Integer moduleType; @@ -44,6 +51,7 @@ public class SysPermModuleDto { /** * 权限模块在当前层级下的顺序，由小到大。 */ + @ApiModelProperty(value = "显示顺序", required = true) @NotNull(message = "权限模块显示顺序不能为空！") private Integer showOrder; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysRoleDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java similarity index 55% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysRoleDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java index 341d9c26..966f51e5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysRoleDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java @@ -1,6 +1,8 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; @@ -11,18 +13,21 @@ import javax.validation.constraints.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("角色Dto") @Data public class SysRoleDto { /** * 角色Id。 */ + @ApiModelProperty(value = "角色Id", required = true) @NotNull(message = "角色Id不能为空！", groups = {UpdateGroup.class}) private Long roleId; /** * 角色名称。 */ + @ApiModelProperty(value = "角色名称", required = true) @NotBlank(message = "角色名称不能为空！") private String roleName; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysUserDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java similarity index 54% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysUserDto.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java index 3b825d2e..903f373a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysUserDto.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java @@ -1,57 +1,68 @@ -package com.orange.demo.webadmin.upms.dto; +package com.orangeforms.webadmin.upms.dto; -import com.orange.demo.common.core.validator.AddGroup; -import com.orange.demo.common.core.validator.UpdateGroup; -import com.orange.demo.common.core.validator.ConstDictRef; -import com.orange.demo.webadmin.upms.model.constant.SysUserType; -import com.orange.demo.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.common.core.validator.AddGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.webadmin.upms.model.constant.SysUserType; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.*; +import java.util.Date; + /** * SysUserDto对象。 * * @author Jerry * @date 2020-09-24 */ +@ApiModel("SysUserDto对象") @Data public class SysUserDto { /** * 用户Id。 */ + @ApiModelProperty(value = "用户Id", required = true) @NotNull(message = "数据验证失败，用户Id不能为空！", groups = {UpdateGroup.class}) private Long userId; /** * 登录用户名。 */ + @ApiModelProperty(value = "登录用户名", required = true) @NotBlank(message = "数据验证失败，登录用户名不能为空！") private String loginName; /** * 用户密码。 */ + @ApiModelProperty(value = "用户密码", required = true) @NotBlank(message = "数据验证失败，用户密码不能为空！", groups = {AddGroup.class}) private String password; /** * 用户显示名称。 */ + @ApiModelProperty(value = "用户显示名称", required = true) @NotBlank(message = "数据验证失败，用户显示名称不能为空！") private String showName; /** * 用户部门Id。 */ + @ApiModelProperty(value = "用户部门Id", required = true) @NotNull(message = "数据验证失败，用户部门Id不能为空！") private Long deptId; /** * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。 */ + @ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)", required = true) @NotNull(message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)不能为空！") @ConstDictRef(constDictClass = SysUserType.class, message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)为无效值！") private Integer userType; @@ -59,22 +70,50 @@ public class SysUserDto { /** * 用户头像的Url。 */ + @ApiModelProperty(value = "用户头像的Url") private String headImageUrl; /** * 用户状态(0: 正常 1: 锁定)。 */ + @ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)", required = true) @NotNull(message = "数据验证失败，用户状态(0: 正常 1: 锁定)不能为空！") @ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败，用户状态(0: 正常 1: 锁定)为无效值！") private Integer userStatus; + /** + * 创建用户Id。 + */ + @ApiModelProperty(value = "创建用户Id") + private Long createUserId; + + /** + * 更新者Id。 + */ + @ApiModelProperty(value = "更新者Id") + private Long updateUserId; + + /** + * 创建时间。 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新时间。 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + /** * createTime 范围过滤起始值(>=)。 */ + @ApiModelProperty(value = "createTime 范围过滤起始值(>=)") private String createTimeStart; /** * createTime 范围过滤结束值(<=)。 */ + @ApiModelProperty(value = "createTime 范围过滤结束值(<=)") private String createTimeEnd; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPerm.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPerm.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPerm.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPerm.java index e2fedfe2..e2391e5b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPerm.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPerm.java @@ -1,10 +1,10 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.util.MyCommonUtil; -import com.orange.demo.common.core.annotation.RelationManyToMany; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysDataPermVo; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.annotation.RelationManyToMany; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysDataPermVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -96,7 +96,7 @@ public class SysDataPerm { * @param sysDataPermVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "dataPermDeptList", expression = "java(mapToBean(sysDataPermVo.getDataPermDeptList(), com.orange.demo.webadmin.upms.model.SysDataPermDept.class))") + @Mapping(target = "dataPermDeptList", expression = "java(mapToBean(sysDataPermVo.getDataPermDeptList(), com.orangeforms.webadmin.upms.model.SysDataPermDept.class))") @Override SysDataPerm toModel(SysDataPermVo sysDataPermVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermDept.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermDept.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermDept.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermDept.java index 29b05146..157d4b16 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermDept.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermDept.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermUser.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermUser.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermUser.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermUser.java index ca110b93..cd10d010 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDataPermUser.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermUser.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDept.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDept.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDept.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDept.java index dd71715b..ff0ae40a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDept.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDept.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysDeptVo; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysDeptVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDeptRelation.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptRelation.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDeptRelation.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptRelation.java index 36a37014..591587e0 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysDeptRelation.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptRelation.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenu.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenu.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenu.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenu.java index 7fa30bd3..911d7593 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenu.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenu.java @@ -1,9 +1,9 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.RelationManyToMany; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysMenuVo; +import com.orangeforms.common.core.annotation.RelationManyToMany; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysMenuVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -120,7 +120,7 @@ public class SysMenu { * @param sysMenuVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "sysMenuPermCodeList", expression = "java(mapToBean(sysMenuVo.getSysMenuPermCodeList(), com.orange.demo.webadmin.upms.model.SysMenuPermCode.class))") + @Mapping(target = "sysMenuPermCodeList", expression = "java(mapToBean(sysMenuVo.getSysMenuPermCodeList(), com.orangeforms.webadmin.upms.model.SysMenuPermCode.class))") @Override SysMenu toModel(SysMenuVo sysMenuVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenuPermCode.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenuPermCode.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenuPermCode.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenuPermCode.java index 10251988..34a8da71 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysMenuPermCode.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenuPermCode.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPerm.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPerm.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPerm.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPerm.java index aeed729f..be9080bb 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPerm.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPerm.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.RelationDict; +import com.orangeforms.common.core.annotation.RelationDict; import lombok.Data; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCode.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCode.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCode.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCode.java index 1de6b38f..b445bcaa 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCode.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCode.java @@ -1,9 +1,9 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.RelationManyToMany; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysPermCodeVo; +import com.orangeforms.common.core.annotation.RelationManyToMany; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysPermCodeVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -103,7 +103,7 @@ public class SysPermCode { * @param sysPermCodeVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "sysPermCodePermList", expression = "java(mapToBean(sysPermCodeVo.getSysPermCodePermList(), com.orange.demo.webadmin.upms.model.SysPermCodePerm.class))") + @Mapping(target = "sysPermCodePermList", expression = "java(mapToBean(sysPermCodeVo.getSysPermCodePermList(), com.orangeforms.webadmin.upms.model.SysPermCodePerm.class))") @Override SysPermCode toModel(SysPermCodeVo sysPermCodeVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCodePerm.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCodePerm.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCodePerm.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCodePerm.java index 0b66a4f5..ce86edc7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermCodePerm.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCodePerm.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermModule.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermModule.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermModule.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermModule.java index e7688b31..b65d002d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermModule.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermModule.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermWhitelist.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermWhitelist.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermWhitelist.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermWhitelist.java index dc1c7df0..79b3fe3e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysPermWhitelist.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermWhitelist.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRole.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRole.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRole.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRole.java index 178d2c19..5223fa81 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRole.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRole.java @@ -1,9 +1,9 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.RelationManyToMany; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysRoleVo; +import com.orangeforms.common.core.annotation.RelationManyToMany; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysRoleVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -79,7 +79,7 @@ public class SysRole { * @param sysRoleVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "sysRoleMenuList", expression = "java(mapToBean(sysRoleVo.getSysRoleMenuList(), com.orange.demo.webadmin.upms.model.SysRoleMenu.class))") + @Mapping(target = "sysRoleMenuList", expression = "java(mapToBean(sysRoleVo.getSysRoleMenuList(), com.orangeforms.webadmin.upms.model.SysRoleMenu.class))") @Override SysRole toModel(SysRoleVo sysRoleVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRoleMenu.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRoleMenu.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRoleMenu.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRoleMenu.java index 78c3ca90..a244f6b7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysRoleMenu.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUser.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUser.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUser.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUser.java index 3607adc9..88ecc258 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUser.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUser.java @@ -1,13 +1,11 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.webadmin.upms.model.constant.SysUserType; -import com.orange.demo.webadmin.upms.model.constant.SysUserStatus; -import com.orange.demo.common.core.annotation.RelationDict; -import com.orange.demo.common.core.annotation.RelationConstDict; -import com.orange.demo.common.core.annotation.RelationManyToMany; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.webadmin.upms.vo.SysUserVo; +import com.orangeforms.webadmin.upms.model.constant.SysUserType; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.webadmin.upms.vo.SysUserVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; @@ -165,8 +163,8 @@ public class SysUser { * @param sysUserVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "sysUserRoleList", expression = "java(mapToBean(sysUserVo.getSysUserRoleList(), com.orange.demo.webadmin.upms.model.SysUserRole.class))") - @Mapping(target = "sysDataPermUserList", expression = "java(mapToBean(sysUserVo.getSysDataPermUserList(), com.orange.demo.webadmin.upms.model.SysDataPermUser.class))") + @Mapping(target = "sysUserRoleList", expression = "java(mapToBean(sysUserVo.getSysUserRoleList(), com.orangeforms.webadmin.upms.model.SysUserRole.class))") + @Mapping(target = "sysDataPermUserList", expression = "java(mapToBean(sysUserVo.getSysDataPermUserList(), com.orangeforms.webadmin.upms.model.SysDataPermUser.class))") @Override SysUser toModel(SysUserVo sysUserVo); /** diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUserRole.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserRole.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUserRole.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserRole.java index 8c999260..2a7ca8c9 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/SysUserRole.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserRole.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model; +package com.orangeforms.webadmin.upms.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysMenuType.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysMenuType.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysMenuType.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysMenuType.java index e2b5e82a..754116e1 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysMenuType.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysMenuType.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysOnlineMenuPermType.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysOnlineMenuPermType.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysOnlineMenuPermType.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysOnlineMenuPermType.java index 2de38f01..df25839b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysOnlineMenuPermType.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysOnlineMenuPermType.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermCodeType.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermCodeType.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermCodeType.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermCodeType.java index 67693c04..857e227d 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermCodeType.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermCodeType.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermModuleType.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermModuleType.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermModuleType.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermModuleType.java index d0943f2f..8041666c 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysPermModuleType.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermModuleType.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserStatus.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserStatus.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserStatus.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserStatus.java index 76dc9c4e..518b9f3e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserStatus.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserStatus.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserType.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserType.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserType.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserType.java index e92a3822..89c17857 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/model/constant/SysUserType.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserType.java @@ -1,4 +1,4 @@ -package com.orange.demo.webadmin.upms.model.constant; +package com.orangeforms.webadmin.upms.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDataPermService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDataPermService.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDataPermService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDataPermService.java index 257018d9..111190bc 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDataPermService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDataPermService.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.model.*; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.model.*; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDeptService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDeptService.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDeptService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDeptService.java index 68ac04f2..ace27d87 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysDeptService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDeptService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysMenuService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysMenuService.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysMenuService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysMenuService.java index dddf0054..72421528 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysMenuService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysMenuService.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.model.SysMenu; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.model.SysMenu; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermCodeService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermCodeService.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermCodeService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermCodeService.java index 3d05f7b0..6959eff6 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermCodeService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermCodeService.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.model.SysPermCode; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.model.SysPermCode; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermModuleService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermModuleService.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermModuleService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermModuleService.java index e947e8f9..dcec0d85 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermModuleService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermModuleService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.webadmin.upms.model.SysPermModule; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.upms.model.SysPermModule; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermService.java similarity index 86% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermService.java index 6c1b4244..89068a95 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermService.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.model.SysPerm; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.model.SysPerm; import java.util.*; @@ -79,15 +79,6 @@ public interface SysPermService extends IBaseService { */ Collection getPermListByUserId(Long userId); - /** - * 验证权限资源对象关联的数据是否都合法。 - * - * @param sysPerm 当前操作的对象。 - * @param originalSysPerm 原有对象。 - * @return 验证结果。 - */ - CallResult verifyRelatedData(SysPerm sysPerm, SysPerm originalSysPerm); - /** * 查询权限资源地址的用户列表。同时返回详细的分配路径。 * diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermWhitelistService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermWhitelistService.java similarity index 75% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermWhitelistService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermWhitelistService.java index e4d09789..87b6ba03 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysPermWhitelistService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermWhitelistService.java @@ -1,7 +1,7 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysRoleService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysRoleService.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysRoleService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysRoleService.java index b21e0cc6..613a2ccf 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysRoleService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysRoleService.java @@ -1,9 +1,9 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.model.SysRole; -import com.orange.demo.webadmin.upms.model.SysUserRole; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.model.SysRole; +import com.orangeforms.webadmin.upms.model.SysUserRole; import java.util.*; @@ -51,6 +51,14 @@ public interface SysRoleService extends IBaseService { */ List getSysRoleList(SysRole filter, String orderBy); + /** + * 获取用户的用户角色对象列表。 + * + * @param userId 用户Id。 + * @return 用户角色对象列表。 + */ + List getSysUserRoleListByUserId(Long userId); + /** * 批量新增用户角色关联。 * diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysUserService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysUserService.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysUserService.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysUserService.java index f8dc80b8..cc14abea 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/SysUserService.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysUserService.java @@ -1,8 +1,8 @@ -package com.orange.demo.webadmin.upms.service; +package com.orangeforms.webadmin.upms.service; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.base.service.IBaseService; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDataPermServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDataPermServiceImpl.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDataPermServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDataPermServiceImpl.java index 1ac24a70..7caee16b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDataPermServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDataPermServiceImpl.java @@ -1,24 +1,24 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.datafilter.constant.DataPermRuleType; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.util.RedisKeyUtil; -import com.orange.demo.webadmin.config.ApplicationConfig; -import com.orange.demo.webadmin.upms.dao.SysDataPermDeptMapper; -import com.orange.demo.webadmin.upms.dao.SysDataPermMapper; -import com.orange.demo.webadmin.upms.dao.SysDataPermUserMapper; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.webadmin.upms.service.SysDataPermService; -import com.orange.demo.webadmin.upms.service.SysDeptService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.datafilter.constant.DataPermRuleType; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.RedisKeyUtil; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.dao.SysDataPermDeptMapper; +import com.orangeforms.webadmin.upms.dao.SysDataPermMapper; +import com.orangeforms.webadmin.upms.dao.SysDataPermUserMapper; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.service.SysDataPermService; +import com.orangeforms.webadmin.upms.service.SysDeptService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDeptServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDeptServiceImpl.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDeptServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDeptServiceImpl.java index b99c4063..aaf0fbe5 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysDeptServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDeptServiceImpl.java @@ -1,16 +1,16 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.webadmin.upms.service.*; -import com.orange.demo.webadmin.upms.dao.*; -import com.orange.demo.webadmin.upms.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.MyRelationParam; -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.orangeforms.webadmin.upms.service.*; +import com.orangeforms.webadmin.upms.dao.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysMenuServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysMenuServiceImpl.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysMenuServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysMenuServiceImpl.java index 8b7fe048..32eea12a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysMenuServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysMenuServiceImpl.java @@ -1,26 +1,26 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.dao.SysMenuMapper; -import com.orange.demo.webadmin.upms.dao.SysMenuPermCodeMapper; -import com.orange.demo.webadmin.upms.dao.SysRoleMenuMapper; -import com.orange.demo.webadmin.upms.model.SysMenu; -import com.orange.demo.webadmin.upms.model.SysMenuPermCode; -import com.orange.demo.webadmin.upms.model.SysRoleMenu; -import com.orange.demo.webadmin.upms.model.constant.SysMenuType; -import com.orange.demo.webadmin.upms.model.constant.SysOnlineMenuPermType; -import com.orange.demo.webadmin.upms.service.SysMenuService; -import com.orange.demo.webadmin.upms.service.SysPermCodeService; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.dao.SysMenuMapper; +import com.orangeforms.webadmin.upms.dao.SysMenuPermCodeMapper; +import com.orangeforms.webadmin.upms.dao.SysRoleMenuMapper; +import com.orangeforms.webadmin.upms.model.SysMenu; +import com.orangeforms.webadmin.upms.model.SysMenuPermCode; +import com.orangeforms.webadmin.upms.model.SysRoleMenu; +import com.orangeforms.webadmin.upms.model.constant.SysMenuType; +import com.orangeforms.webadmin.upms.model.constant.SysOnlineMenuPermType; +import com.orangeforms.webadmin.upms.service.SysMenuService; +import com.orangeforms.webadmin.upms.service.SysPermCodeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermCodeServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermCodeServiceImpl.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermCodeServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermCodeServiceImpl.java index 15e561d3..8d5db4a8 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermCodeServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermCodeServiceImpl.java @@ -1,22 +1,22 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.dao.SysMenuPermCodeMapper; -import com.orange.demo.webadmin.upms.dao.SysPermCodeMapper; -import com.orange.demo.webadmin.upms.dao.SysPermCodePermMapper; -import com.orange.demo.webadmin.upms.model.SysMenuPermCode; -import com.orange.demo.webadmin.upms.model.SysPermCode; -import com.orange.demo.webadmin.upms.model.SysPermCodePerm; -import com.orange.demo.webadmin.upms.service.SysPermCodeService; -import com.orange.demo.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.dao.SysMenuPermCodeMapper; +import com.orangeforms.webadmin.upms.dao.SysPermCodeMapper; +import com.orangeforms.webadmin.upms.dao.SysPermCodePermMapper; +import com.orangeforms.webadmin.upms.model.SysMenuPermCode; +import com.orangeforms.webadmin.upms.model.SysPermCode; +import com.orangeforms.webadmin.upms.model.SysPermCodePerm; +import com.orangeforms.webadmin.upms.service.SysPermCodeService; +import com.orangeforms.webadmin.upms.service.SysPermService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermModuleServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermModuleServiceImpl.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermModuleServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermModuleServiceImpl.java index 94caeaf1..e45785dc 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermModuleServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermModuleServiceImpl.java @@ -1,15 +1,15 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.webadmin.upms.dao.SysPermModuleMapper; -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.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.webadmin.upms.dao.SysPermModuleMapper; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.model.SysPermModule; +import com.orangeforms.webadmin.upms.service.SysPermModuleService; +import com.orangeforms.webadmin.upms.service.SysPermService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermServiceImpl.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermServiceImpl.java index 56f41b56..c3d5ce57 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermServiceImpl.java @@ -1,22 +1,22 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.util.ObjectUtil; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.object.MyRelationParam; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.util.RedisKeyUtil; -import com.orange.demo.webadmin.config.ApplicationConfig; -import com.orange.demo.webadmin.upms.service.*; -import com.orange.demo.webadmin.upms.dao.SysPermCodePermMapper; -import com.orange.demo.webadmin.upms.dao.SysPermMapper; -import com.orange.demo.webadmin.upms.model.SysPerm; -import com.orange.demo.webadmin.upms.model.SysPermCodePerm; -import com.orange.demo.webadmin.upms.model.SysPermModule; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.RedisKeyUtil; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.webadmin.upms.dao.SysPermCodePermMapper; +import com.orangeforms.webadmin.upms.dao.SysPermMapper; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.model.SysPermCodePerm; +import com.orangeforms.webadmin.upms.model.SysPermModule; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.redisson.api.RSet; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java similarity index 79% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java index 0a325beb..7c61107e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java @@ -1,10 +1,10 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.webadmin.upms.dao.SysPermWhitelistMapper; -import com.orange.demo.webadmin.upms.model.SysPermWhitelist; -import com.orange.demo.webadmin.upms.service.SysPermWhitelistService; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.dao.SysPermWhitelistMapper; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.webadmin.upms.service.SysPermWhitelistService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysRoleServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysRoleServiceImpl.java similarity index 86% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysRoleServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysRoleServiceImpl.java index cef3cef7..10968b5e 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysRoleServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysRoleServiceImpl.java @@ -1,21 +1,21 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.alibaba.fastjson.JSONObject; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.object.CallResult; -import com.orange.demo.webadmin.upms.dao.SysRoleMapper; -import com.orange.demo.webadmin.upms.dao.SysRoleMenuMapper; -import com.orange.demo.webadmin.upms.dao.SysUserRoleMapper; -import com.orange.demo.webadmin.upms.model.SysRole; -import com.orange.demo.webadmin.upms.model.SysRoleMenu; -import com.orange.demo.webadmin.upms.model.SysUserRole; -import com.orange.demo.webadmin.upms.service.SysMenuService; -import com.orange.demo.webadmin.upms.service.SysRoleService; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.webadmin.upms.dao.SysRoleMapper; +import com.orangeforms.webadmin.upms.dao.SysRoleMenuMapper; +import com.orangeforms.webadmin.upms.dao.SysUserRoleMapper; +import com.orangeforms.webadmin.upms.model.SysRole; +import com.orangeforms.webadmin.upms.model.SysRoleMenu; +import com.orangeforms.webadmin.upms.model.SysUserRole; +import com.orangeforms.webadmin.upms.service.SysMenuService; +import com.orangeforms.webadmin.upms.service.SysRoleService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -143,6 +143,13 @@ public class SysRoleServiceImpl extends BaseService implements Sy return sysRoleMapper.getSysRoleList(filter, orderBy); } + @Override + public List getSysUserRoleListByUserId(Long userId) { + SysUserRole filter = new SysUserRole(); + filter.setUserId(userId); + return sysUserRoleMapper.selectList(new QueryWrapper<>(filter)); + } + /** * 批量新增用户角色关联。 * diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysUserServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysUserServiceImpl.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysUserServiceImpl.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysUserServiceImpl.java index b24dace2..deabe1d7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/service/impl/SysUserServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysUserServiceImpl.java @@ -1,19 +1,19 @@ -package com.orange.demo.webadmin.upms.service.impl; +package com.orangeforms.webadmin.upms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.alibaba.fastjson.JSONObject; -import com.orange.demo.webadmin.upms.service.*; -import com.orange.demo.webadmin.upms.dao.*; -import com.orange.demo.webadmin.upms.model.*; -import com.orange.demo.webadmin.upms.model.constant.SysUserStatus; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -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.orangeforms.webadmin.upms.service.*; +import com.orangeforms.webadmin.upms.dao.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermDeptVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java similarity index 51% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermDeptVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java index d1e91ba9..34e2621a 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermDeptVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,16 +10,19 @@ import lombok.Data; * @author Jerry * @date 2020-09-24 */ +@ApiModel("数据权限与部门关联VO") @Data public class SysDataPermDeptVo { /** * 数据权限Id。 */ + @ApiModelProperty(value = "数据权限Id") private Long dataPermId; /** * 关联部门Id。 */ + @ApiModelProperty(value = "关联部门Id") private Long deptId; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java similarity index 61% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java index d7897d70..39dbd4f7 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDataPermVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,51 +12,61 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("数据权限VO") @Data public class SysDataPermVo { /** * 数据权限Id。 */ + @ApiModelProperty(value = "数据权限Id") private Long dataPermId; /** * 显示名称。 */ + @ApiModelProperty(value = "显示名称") private String dataPermName; /** * 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。 */ + @ApiModelProperty(value = "数据权限规则类型") private Integer ruleType; /** * 部门Id列表(逗号分隔)。 */ + @ApiModelProperty(value = "部门Id列表") private String deptIdListString; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 数据权限与部门关联对象列表。 */ + @ApiModelProperty(value = "数据权限与部门关联对象列表") private List> dataPermDeptList; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDeptVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDeptVo.java similarity index 57% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDeptVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDeptVo.java index 8867b8de..f6982145 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysDeptVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDeptVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -10,46 +12,55 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("SysDeptVO视图对象") @Data public class SysDeptVo { /** * 部门Id。 */ + @ApiModelProperty(value = "部门Id") private Long deptId; /** * 部门名称。 */ + @ApiModelProperty(value = "部门名称") private String deptName; /** * 显示顺序。 */ + @ApiModelProperty(value = "显示顺序") private Integer showOrder; /** * 父部门Id。 */ + @ApiModelProperty(value = "父部门Id") private Long parentId; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysMenuVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysMenuVo.java similarity index 62% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysMenuVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysMenuVo.java index b5314ba9..38a8b480 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysMenuVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysMenuVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,76 +12,91 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("菜单VO") @Data public class SysMenuVo { /** * 菜单Id。 */ + @ApiModelProperty(value = "菜单Id") private Long menuId; /** * 父菜单Id，目录菜单的父菜单为null */ + @ApiModelProperty(value = "父菜单Id") private Long parentId; /** * 菜单显示名称。 */ + @ApiModelProperty(value = "菜单显示名称") private String menuName; /** * 菜单类型 (0: 目录 1: 菜单 2: 按钮 3: UI片段)。 */ + @ApiModelProperty(value = "菜单类型") private Integer menuType; /** * 前端表单路由名称，仅用于menu_type为1的菜单类型。 */ + @ApiModelProperty(value = "前端表单路由名称") private String formRouterName; /** * 在线表单主键Id，仅用于在线表单绑定的菜单。 */ + @ApiModelProperty(value = "在线表单主键Id") private Long onlineFormId; /** * 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。 */ + @ApiModelProperty(value = "在线表单菜单的权限控制类型") private Integer onlineMenuPermType; /** * 菜单显示顺序 (值越小，排序越靠前)。 */ + @ApiModelProperty(value = "菜单显示顺序") private Integer showOrder; /** * 菜单图标。 */ + @ApiModelProperty(value = "菜单显示顺序") private String icon; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 菜单与权限字关联对象列表。 */ + @ApiModelProperty(value = "菜单与权限字关联对象列表") private List> sysMenuPermCodeList; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysOperationLogVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysOperationLogVo.java similarity index 65% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysOperationLogVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysOperationLogVo.java index 79ae3a89..37d39c02 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysOperationLogVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysOperationLogVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -10,113 +12,134 @@ import java.util.Date; * @author Jerry * @date 2020-09-24 */ +@ApiModel("操作日志VO") @Data public class SysOperationLogVo { /** * 操作日志主键Id。 */ + @ApiModelProperty(value = "操作日志主键Id") private Long logId; /** * 日志描述。 */ + @ApiModelProperty(value = "日志描述") private String description; /** * 操作类型。 * 常量值定义可参考SysOperationLogType对象。 */ + @ApiModelProperty(value = "操作类型") private Integer operationType; /** * 接口所在服务名称。 * 通常为spring.application.name配置项的值。 */ + @ApiModelProperty(value = "接口所在服务名称") private String serviceName; /** * 调用的controller全类名。 * 之所以为独立字段，是为了便于查询和统计接口的调用频度。 */ + @ApiModelProperty(value = "调用的controller全类名") private String apiClass; /** * 调用的controller中的方法。 * 格式为：接口类名 + "." + 方法名。 */ + @ApiModelProperty(value = "调用的controller中的方法") private String apiMethod; /** * 用户会话sessionId。 * 主要是为了便于统计，以及跟踪查询定位问题。 */ + @ApiModelProperty(value = "用户会话sessionId") private String sessionId; /** * 每次请求的Id。 * 对于微服务之间的调用，在同一个请求的调用链中，该值是相同的。 */ + @ApiModelProperty(value = "每次请求的Id") private String traceId; /** * 调用时长。 */ + @ApiModelProperty(value = "调用时长") private Long elapse; /** * HTTP 请求方法，如GET。 */ + @ApiModelProperty(value = "HTTP 请求方法") private String requestMethod; /** * HTTP 请求地址。 */ + @ApiModelProperty(value = "HTTP 请求地址") private String requestUrl; /** * controller接口参数。 */ + @ApiModelProperty(value = "controller接口参数") private String requestArguments; /** * controller应答结果。 */ + @ApiModelProperty(value = "controller应答结果") private String responseResult; /** * 请求IP。 */ + @ApiModelProperty(value = "请求IP") private String requestIp; /** * 应答状态。 */ + @ApiModelProperty(value = "应答状态") private Boolean success; /** * 错误信息。 */ + @ApiModelProperty(value = "错误信息") private String errorMsg; /** * 租户Id。 * 仅用于多租户系统，是便于进行对租户的操作查询和统计分析。 */ + @ApiModelProperty(value = "租户Id") private Long tenantId; /** * 操作员Id。 */ + @ApiModelProperty(value = "操作员Id") private Long operatorId; /** * 操作员名称。 */ + @ApiModelProperty(value = "操作员名称") private String operatorName; /** * 操作时间。 */ + @ApiModelProperty(value = "操作时间") private Date operationTime; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermCodeVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermCodeVo.java similarity index 60% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermCodeVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermCodeVo.java index e1cf4f1f..b79e83aa 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermCodeVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermCodeVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,61 +12,73 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限字VO") @Data public class SysPermCodeVo { /** * 权限字Id。 */ + @ApiModelProperty(value = "权限字Id") private Long permCodeId; /** * 权限字标识(一般为有含义的英文字符串)。 */ + @ApiModelProperty(value = "权限字标识") private String permCode; /** * 上级权限字Id。 */ + @ApiModelProperty(value = "上级权限字Id") private Long parentId; /** * 权限字类型(0: 表单 1: UI片段 2: 操作)。 */ + @ApiModelProperty(value = "权限字类型") private Integer permCodeType; /** * 显示名称。 */ + @ApiModelProperty(value = "显示名称") private String showName; /** * 显示顺序(数值越小，越靠前)。 */ + @ApiModelProperty(value = "显示顺序") private Integer showOrder; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 权限字与权限资源关联对象列表。 */ + @ApiModelProperty(value = "权限字与权限资源关联对象列表") private List> sysPermCodePermList; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermModuleVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermModuleVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermModuleVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermModuleVo.java index 3201867c..bed5d492 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermModuleVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermModuleVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,56 +12,67 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限资源模块VO") @Data public class SysPermModuleVo { /** * 权限模块Id。 */ + @ApiModelProperty(value = "权限模块Id") private Long moduleId; /** * 权限模块名称。 */ + @ApiModelProperty(value = "权限模块名称") private String moduleName; /** * 上级权限模块Id。 */ + @ApiModelProperty(value = "上级权限模块Id") private Long parentId; /** * 权限模块类型(0: 普通模块 1: Controller模块)。 */ + @ApiModelProperty(value = "权限模块类型") private Integer moduleType; /** * 权限模块在当前层级下的顺序，由小到大。 */ + @ApiModelProperty(value = "显示顺序") private Integer showOrder; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 权限资源对象列表。 */ + @ApiModelProperty(value = "权限资源对象列表") private List sysPermList; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermVo.java index c743ba3c..63981a69 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysPermVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,61 +12,73 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("权限资源VO") @Data public class SysPermVo { /** * 权限资源Id。 */ + @ApiModelProperty(value = "权限资源Id") private Long permId; /** * 权限资源名称。 */ + @ApiModelProperty(value = "权限资源名称") private String permName; /** * shiro格式的权限字，如(upms:sysUser:add)。 */ + @ApiModelProperty(value = "权限字") private String permCode; /** * 权限所在的权限模块Id。 */ + @ApiModelProperty(value = "权限所在的权限模块Id") private Long moduleId; /** * 关联的URL。 */ + @ApiModelProperty(value = "关联的URL") private String url; /** * 权限在当前模块下的顺序，由小到大。 */ + @ApiModelProperty(value = "显示顺序") private Integer showOrder; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 模块Id的字典关联数据。 */ + @ApiModelProperty(value = "模块Id的字典关联数据") private Map moduleIdDictMap; } \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysRoleVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysRoleVo.java similarity index 57% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysRoleVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysRoleVo.java index 2770ccb8..70c5c50f 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysRoleVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysRoleVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.*; @@ -10,41 +12,49 @@ import java.util.*; * @author Jerry * @date 2020-09-24 */ +@ApiModel("角色VO") @Data public class SysRoleVo { /** * 角色Id。 */ + @ApiModelProperty(value = "角色Id") private Long roleId; /** * 角色名称。 */ + @ApiModelProperty(value = "角色名称") private String roleName; /** * 创建者Id。 */ + @ApiModelProperty(value = "创建者Id") private Long createUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 角色与菜单关联对象列表。 */ + @ApiModelProperty(value = "角色与菜单关联对象列表") private List> sysRoleMenuList; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysUserVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysUserVo.java similarity index 59% rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysUserVo.java rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysUserVo.java index 85668e84..32985d06 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/vo/SysUserVo.java +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysUserVo.java @@ -1,5 +1,7 @@ -package com.orange.demo.webadmin.upms.vo; +package com.orangeforms.webadmin.upms.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -12,86 +14,103 @@ import java.util.List; * @author Jerry * @date 2020-09-24 */ +@ApiModel("SysUserVO视图对象") @Data public class SysUserVo { /** * 用户Id。 */ + @ApiModelProperty(value = "用户Id") private Long userId; /** * 登录用户名。 */ + @ApiModelProperty(value = "登录用户名") private String loginName; /** * 用户显示名称。 */ + @ApiModelProperty(value = "用户显示名称") private String showName; /** * 用户部门Id。 */ + @ApiModelProperty(value = "用户部门Id") private Long deptId; /** * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。 */ + @ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)") private Integer userType; /** * 用户头像的Url。 */ + @ApiModelProperty(value = "用户头像的Url") private String headImageUrl; /** * 用户状态(0: 正常 1: 锁定)。 */ + @ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)") private Integer userStatus; /** * 创建用户Id。 */ + @ApiModelProperty(value = "创建用户Id") private Long createUserId; /** * 更新者Id。 */ + @ApiModelProperty(value = "更新者Id") private Long updateUserId; /** * 创建时间。 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新时间。 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 多对多用户角色数据集合。 */ + @ApiModelProperty(value = "多对多用户角色数据集合") private List> sysUserRoleList; /** * 多对多用户数据权限数据集合。 */ + @ApiModelProperty(value = "多对多用户数据权限数据集合") private List> sysDataPermUserList; /** * deptId 字典关联数据。 */ + @ApiModelProperty(value = "deptId 字典关联数据") private Map deptIdDictMap; /** * userType 常量字典关联数据。 */ + @ApiModelProperty(value = "userType 常量字典关联数据") private Map userTypeDictMap; /** * userStatus 常量字典关联数据。 */ + @ApiModelProperty(value = "userStatus 常量字典关联数据") private Map userStatusDictMap; } diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application.yml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application.yml index b287b7e6..36df8fb9 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application.yml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application.yml @@ -1,7 +1,7 @@ logging: level: # 这里设置的日志级别优先于log4j2.xml文件Loggers中的日志级别。 - com.orange.demo: info + com.orangeforms: info server: port: 8082 @@ -41,8 +41,8 @@ spring: suffix: .ftl mybatis-plus: - mapper-locations: classpath:com/orange/demo/webadmin/*/dao/mapper/*Mapper.xml,com/orange/demo/common/log/dao/mapper/*Mapper.xml - type-aliases-package: com.orange.demo.webadmin.*.model,com.orange.demo.common.log.model + mapper-locations: classpath:com/orangeforms/webadmin/*/dao/mapper/*Mapper.xml,com/orangeforms/common/log/dao/mapper/*Mapper.xml + type-aliases-package: com.orangeforms.webadmin.*.model,com.orangeforms.common.log.model global-config: db-config: logic-delete-value: -1 @@ -89,6 +89,17 @@ redis: # 连接池中最小空闲数量。 minIdle: 5 +swagger: + # 当enabled为false的时候，则可禁用swagger。 + enabled: true + # 工程的基础包名。 + basePackage: com.orangeforms + # 工程服务的基础包名。 + serviceBasePackage: com.orangeforms.webadmin + title: 橙单单体服务工程 + description: 橙单单体服务工程详情 + version: 1.0 + datafilter: tenant: # 对于单体服务，该值始终为false。 diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/log4j2.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/log4j2.xml index b03b5ad9..6b5fc52b 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/log4j2.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/log4j2.xml @@ -53,20 +53,23 @@ - + + + + - + - + - + diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-core/pom.xml index f2a0047b..43e24aa8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-core/pom.xml @@ -2,7 +2,7 @@ - com.orange.demo + com.orangeforms common 1.0.0 @@ -94,6 +94,16 @@ com.alibaba druid-spring-boot-starter ${druid.version} + + + com.sun + jconsole + + + com.sun + tools + + com.baomidou diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyControllerAdvice.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyControllerAdvice.java index 53d7e496..3fd6c9e7 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyControllerAdvice.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.advice; +package com.orangeforms.common.core.advice; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.web.bind.WebDataBinder; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyExceptionHandler.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyExceptionHandler.java index 984311f5..451feb36 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyExceptionHandler.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.core.advice; +package com.orangeforms.common.core.advice; -import com.orange.demo.common.core.exception.*; -import com.orange.demo.common.core.constant.ErrorCodeEnum; -import com.orange.demo.common.core.object.ResponseResult; -import com.orange.demo.common.core.util.ContextUtil; +import com.orangeforms.common.core.exception.*; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.util.ContextUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.exceptions.PersistenceException; import org.springframework.dao.DataAccessException; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; * @date 2020-09-24 */ @Slf4j -@RestControllerAdvice("com.orange.demo") +@RestControllerAdvice("com.orangeforms") public class MyExceptionHandler { /** diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DeptFilterColumn.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DeptFilterColumn.java index bf387a1f..1e93af42 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DeptFilterColumn.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableDataFilter.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableDataFilter.java index 340f92f3..6ce8597a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableDataFilter.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableTenantFilter.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableTenantFilter.java index 1eade725..518ff433 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableTenantFilter.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/EnableDataPerm.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/EnableDataPerm.java index 5f92a9e5..44d75460 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/EnableDataPerm.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/JobUpdateTimeColumn.java similarity index 64% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/JobUpdateTimeColumn.java index fcf2a6e2..cd91e034 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/JobUpdateTimeColumn.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; /** - * 主要用于标记更新字段。 + * 主要用于标记Job实体对象的更新时间字段。 * * @author Jerry * @date 2020-09-24 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSource.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSource.java index a8eba077..4d07ab70 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSource.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSourceResolver.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSourceResolver.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSourceResolver.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSourceResolver.java index 3e0e6705..b85df582 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSourceResolver.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSourceResolver.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.util.DataSourceResolver; +import com.orangeforms.common.core.util.DataSourceResolver; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyRequestBody.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyRequestBody.java index cb52d6d5..9f91c8b9 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyRequestBody.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/NoAuthInterface.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/NoAuthInterface.java index 54a7bdff..2dd10371 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/NoAuthInterface.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationConstDict.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationConstDict.java index 658b6bdb..936866b2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationConstDict.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationDict.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationDict.java index 7cd9681d..979acc20 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationDict.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.object.DummyClass; +import com.orangeforms.common.core.object.DummyClass; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToMany.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToMany.java index 2cf58252..8bc2f3d6 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToMany.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToManyAggregation.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToManyAggregation.java index 339be9f2..95e2836d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToManyAggregation.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.object.DummyClass; +import com.orangeforms.common.core.object.DummyClass; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToMany.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToMany.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToMany.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToMany.java index fc112b78..474d6556 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToMany.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToMany.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.object.DummyClass; +import com.orangeforms.common.core.object.DummyClass; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToManyAggregation.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToManyAggregation.java index e62c5ce8..77ab37b2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToManyAggregation.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.object.DummyClass; +import com.orangeforms.common.core.object.DummyClass; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToOne.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToOne.java index 8d021907..5c713711 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToOne.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.object.DummyClass; +import com.orangeforms.common.core.object.DummyClass; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/TenantFilterColumn.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/TenantFilterColumn.java index 8ca76178..4f2a536d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/TenantFilterColumn.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UploadFlagColumn.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UploadFlagColumn.java similarity index 77% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UploadFlagColumn.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UploadFlagColumn.java index dd308cbe..2d072a8a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UploadFlagColumn.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UploadFlagColumn.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; -import com.orange.demo.common.core.upload.UploadStoreTypeEnum; +import com.orangeforms.common.core.upload.UploadStoreTypeEnum; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UserFilterColumn.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UserFilterColumn.java index c9d46c8a..591e8305 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UserFilterColumn.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.annotation; +package com.orangeforms.common.core.annotation; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceAspect.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceAspect.java similarity index 81% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceAspect.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceAspect.java index d0bfb0ff..d5c79840 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceAspect.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceAspect.java @@ -1,7 +1,7 @@ -package com.orange.demo.common.core.aop; +package com.orangeforms.common.core.aop; -import com.orange.demo.common.core.annotation.MyDataSource; -import com.orange.demo.common.core.config.DataSourceContextHolder; +import com.orangeforms.common.core.annotation.MyDataSource; +import com.orangeforms.common.core.config.DataSourceContextHolder; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -25,8 +25,8 @@ public class DataSourceAspect { /** * 所有配置MyDataSource注解的Service实现类。 */ - @Pointcut("execution(public * com.orange.demo..service..*(..)) " + - "&& @target(com.orange.demo.common.core.annotation.MyDataSource)") + @Pointcut("execution(public * com.orangeforms..service..*(..)) " + + "&& @target(com.orangeforms.common.core.annotation.MyDataSource)") public void datasourcePointCut() { // 空注释，避免sonar警告 } diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceResolveAspect.java similarity index 82% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceResolveAspect.java index 61edb7e1..969c1936 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceResolveAspect.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.core.aop; +package com.orangeforms.common.core.aop; -import com.orange.demo.common.core.annotation.MyDataSourceResolver; -import com.orange.demo.common.core.util.DataSourceResolver; -import com.orange.demo.common.core.config.DataSourceContextHolder; -import com.orange.demo.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.core.annotation.MyDataSourceResolver; +import com.orangeforms.common.core.util.DataSourceResolver; +import com.orangeforms.common.core.config.DataSourceContextHolder; +import com.orangeforms.common.core.util.ApplicationContextHolder; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -32,8 +32,8 @@ public class DataSourceResolveAspect { /** * 所有配置 MyDataSource 注解的Service。 */ - @Pointcut("execution(public * com.orange.demo..service..*(..)) " + - "&& @target(com.orange.demo.common.core.annotation.MyDataSourceResolver)") + @Pointcut("execution(public * com.orangeforms..service..*(..)) " + + "&& @target(com.orangeforms.common.core.annotation.MyDataSourceResolver)") public void datasourceResolverPointCut() { // 空注释，避免sonar警告 } diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DictCacheSyncAspect.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DictCacheSyncAspect.java index 52083627..2b0c637d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DictCacheSyncAspect.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.aop; +package com.orangeforms.common.core.aop; -import com.orange.demo.common.core.base.service.BaseDictService; +import com.orangeforms.common.core.base.service.BaseDictService; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -27,9 +27,9 @@ public class DictCacheSyncAspect { /** * BaseDictService 字典服务父类中的字典数据增删改的方法。 */ - @Pointcut("execution(public * com.orange.demo..BaseDictService.saveNew (..)) " + - "|| execution(public * com.orange.demo..BaseDictService.update (..)) " + - "|| execution(public * com.orange.demo..BaseDictService.remove (..))" ) + @Pointcut("execution(public * com.orangeforms..BaseDictService.saveNew (..)) " + + "|| execution(public * com.orangeforms..BaseDictService.update (..)) " + + "|| execution(public * com.orangeforms..BaseDictService.remove (..))" ) public void baseDictServicePointCut() { // 空注释，避免sonar警告 } diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/dao/BaseDaoMapper.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/dao/BaseDaoMapper.java index e8d0d56a..3bea0ac8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/dao/BaseDaoMapper.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.base.dao; +package com.orangeforms.common.core.base.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/BaseModelMapper.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/BaseModelMapper.java index c0e58c91..4660ec33 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/BaseModelMapper.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.base.mapper; +package com.orangeforms.common.core.base.mapper; import cn.hutool.core.bean.BeanUtil; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/DummyModelMapper.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/DummyModelMapper.java index 541b6079..48e78289 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/DummyModelMapper.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.base.mapper; +package com.orangeforms.common.core.base.mapper; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseDictService.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseDictService.java index ea401e26..ec0c1576 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseDictService.java @@ -1,11 +1,11 @@ -package com.orange.demo.common.core.base.service; +package com.orangeforms.common.core.base.service; import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.exception.MyRuntimeException; -import com.orange.demo.common.core.cache.DictionaryCache; -import com.orange.demo.common.core.object.TokenData; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.exception.MyRuntimeException; +import com.orangeforms.common.core.cache.DictionaryCache; +import com.orangeforms.common.core.object.TokenData; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseService.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseService.java index 1c5732a9..b67a95e3 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseService.java @@ -1,20 +1,21 @@ -package com.orange.demo.common.core.base.service; +package com.orangeforms.common.core.base.service; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.orange.demo.common.core.annotation.*; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.constant.AggregationType; -import com.orange.demo.common.core.constant.GlobalDeletedFlag; -import com.orange.demo.common.core.exception.InvalidDataFieldException; -import com.orange.demo.common.core.exception.MyRuntimeException; -import com.orange.demo.common.core.object.*; -import com.orange.demo.common.core.util.AopTargetUtil; -import com.orange.demo.common.core.util.ApplicationContextHolder; -import com.orange.demo.common.core.util.MyModelUtil; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.AggregationType; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.exception.InvalidDataFieldException; +import com.orangeforms.common.core.exception.MyRuntimeException; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.AopTargetUtil; +import com.orangeforms.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.core.util.MyModelUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -28,9 +29,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.util.*; -import java.util.function.Function; +import java.util.function.BiConsumer; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; import static java.util.stream.Collectors.*; @@ -87,11 +88,27 @@ public abstract class BaseService extends ServiceImpl /** * 当前Job服务源主表Model对象最后更新时间字段名称。 */ - protected String updateTimeFieldName; + protected String jobUpdateTimeFieldName; /** * 当前Job服务源主表Model对象最后更新时间列名称。 */ + protected String jobUpdateTimeColumnName; + /** + * 当前业务服务源主表Model对象最后更新时间字段名称。 + */ + protected String updateTimeFieldName; + /** + * 当前业务服务源主表Model对象最后更新时间列名称。 + */ protected String updateTimeColumnName; + /** + * 当前业务服务源主表Model对象最后更新用户Id字段名称。 + */ + protected String updateUserIdFieldName; + /** + * 当前业务服务源主表Model对象最后更新用户Id列名称。 + */ + protected String updateUserIdColumnName; /** * 当前Service关联的主Model对象主键字段赋值方法的反射对象。 */ @@ -132,6 +149,10 @@ public abstract class BaseService extends ServiceImpl * 当前Service关联的主Model对象的所有多对多聚合关联的结构列表，该字段在系统启动阶段一次性预加载，提升运行时效率。 */ private final List relationManyToManyAggrStructList = new LinkedList<>(); + /** + * 基础表的实体对象及表信息。 + */ + private final TableModelInfo tableModelInfo = new TableModelInfo(); private static final String GROUPED_KEY = "groupedKey"; private static final String AGGREGATED_VALUE = "aggregatedValue"; @@ -154,6 +175,15 @@ public abstract class BaseService extends ServiceImpl for (Field field : fields) { initializeField(field); } + tableModelInfo.setModelName(modelClass.getSimpleName()); + tableModelInfo.setTableName(this.tableName); + tableModelInfo.setKeyFieldName(idFieldName); + tableModelInfo.setKeyColumnName(idColumnName); + } + + @Override + public TableModelInfo getTableModelInfo() { + return this.tableModelInfo; } private void initializeField(Field field) { @@ -166,9 +196,9 @@ public abstract class BaseService extends ServiceImpl getIdFieldMethod = ReflectUtil.getMethod( modelClass, "get" + StringUtils.capitalize(idFieldName)); } - if (updateTimeFieldName == null && null != field.getAnnotation(JobUpdateTimeColumn.class)) { - updateTimeFieldName = field.getName(); - updateTimeColumnName = this.safeMapToColumnName(updateTimeFieldName); + if (jobUpdateTimeFieldName == null && null != field.getAnnotation(JobUpdateTimeColumn.class)) { + jobUpdateTimeFieldName = field.getName(); + jobUpdateTimeColumnName = this.safeMapToColumnName(jobUpdateTimeFieldName); } if (deletedFlagFieldName == null && null != field.getAnnotation(TableLogic.class)) { deletedFlagFieldName = field.getName(); @@ -190,6 +220,41 @@ public abstract class BaseService extends ServiceImpl */ protected abstract BaseDaoMapper mapper(); + @SuppressWarnings("unchecked") + @Override + public void saveNewOrUpdate(M data, Consumer saveNew, BiConsumer update) { + if (data == null) { + return; + } + K id = (K) ReflectUtil.getFieldValue(data, idFieldName); + if (id == null) { + saveNew.accept(data); + } else { + update.accept(data, this.getById(id)); + } + } + + @SuppressWarnings("unchecked") + @Override + public void saveNewOrUpdateBatch(List dataList, Consumer> saveNewBatch, BiConsumer update) { + if (CollUtil.isEmpty(dataList)) { + return; + } + List saveNewDataList = dataList.stream() + .filter(c -> ReflectUtil.getFieldValue(c, idFieldName) == null).collect(toList()); + if (CollUtil.isNotEmpty(saveNewDataList)) { + saveNewBatch.accept(saveNewDataList); + } + List updateDataList = dataList.stream() + .filter(c -> ReflectUtil.getFieldValue(c, idFieldName) != null).collect(toList()); + if (CollUtil.isNotEmpty(updateDataList)) { + for (M data : updateDataList) { + K id = (K) ReflectUtil.getFieldValue(data, idFieldName); + update.accept(data, this.getById(id)); + } + } + } + /** * 根据过滤条件删除数据。 * @@ -202,6 +267,58 @@ public abstract class BaseService extends ServiceImpl return mapper().delete(new QueryWrapper<>(filter)); } + @Transactional(rollbackFor = Exception.class) + @Override + public void updateBatchOneToManyRelation( + String relationFieldName, + Object relationFieldValue, + String updateUserIdFieldName, + String updateTimeFieldName, + List dataList, + Consumer> batchInserter) { + // 删除在现有数据列表dataList中不存在的从表数据。 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(this.safeMapToColumnName(relationFieldName), relationFieldValue); + if (CollUtil.isNotEmpty(dataList)) { + Set keptIdSet = dataList.stream() + .filter(c -> ReflectUtil.getFieldValue(c, idFieldName) != null) + .map(c -> ReflectUtil.getFieldValue(c, idFieldName)).collect(toSet()); + if (CollUtil.isNotEmpty(keptIdSet)) { + queryWrapper.notIn(idColumnName, keptIdSet); + } + } + mapper().delete(queryWrapper); + if (CollUtil.isNotEmpty(dataList)) { + // 没有包含主键的对象被视为新对象，为了效率最优化，这里执行批量插入。 + List newDataList = dataList.stream() + .filter(c -> ReflectUtil.getFieldValue(c, idFieldName) == null).collect(toList()); + if (CollUtil.isNotEmpty(newDataList)) { + newDataList.forEach(o -> ReflectUtil.setFieldValue(o, relationFieldName, relationFieldValue)); + batchInserter.accept(newDataList); + } + // 对于主键已经存在的数据，我们视为已存在数据，这里执行逐条更新操作。 + List updateDataList = + dataList.stream().filter(c -> ReflectUtil.getFieldValue(c, idFieldName) != null).collect(toList()); + for (M updateData : updateDataList) { + // 如果前端将更新用户Id置空，这里使用当前用户更新该字段。 + if (updateUserIdFieldName != null && ReflectUtil.getFieldValue(updateData, updateUserIdFieldName) == null) { + ReflectUtil.setFieldValue(updateData, updateUserIdFieldName, TokenData.takeFromRequest().getUserId()); + } + // 如果前端将更新时间置空，这里使用当前时间更新该字段。 + if (updateTimeFieldName != null && ReflectUtil.getFieldValue(updateData, updateTimeFieldName) == null) { + ReflectUtil.setFieldValue(updateData, updateTimeFieldName, new Date()); + } + if (this.deletedFlagFieldName != null) { + ReflectUtil.setFieldValue(updateData, deletedFlagFieldName, GlobalDeletedFlag.NORMAL); + } + @SuppressWarnings("unchecked") + UpdateWrapper uw = this.createUpdateQueryForNullValue( + updateData, (K) ReflectUtil.getFieldValue(updateData, idFieldName)); + mapper().update(updateData, uw); + } + } + } + /** * 判断指定字段的数据是否存在，且仅仅存在一条记录。 * 如果是基于主键的过滤，会直接调用existId过滤函数，提升性能。在有缓存的场景下，也可以利用缓存。 @@ -515,6 +632,47 @@ public abstract class BaseService extends ServiceImpl return mapper().getCountByCondition(this.tableName, whereClause); } + @Override + public CallResult verifyRelatedData(M data, M originalData) { + return CallResult.ok(); + } + + @SuppressWarnings("unchecked") + @Override + public CallResult verifyRelatedData(List dataList) { + if (CollUtil.isEmpty(dataList)) { + return CallResult.ok(); + } + // 1. 先过滤出数据列表中的主键Id集合。 + Set idList = dataList.stream() + .filter(c -> ReflectUtil.getFieldValue(c, idFieldName) != null) + .map(c -> (K) ReflectUtil.getFieldValue(c, idFieldName)).collect(toSet()); + // 2. 列表中，我们目前仅支持全部是更新数据，或全部新增数据，不能混着。如果有主键值，说明当前全是更新数据。 + if (CollUtil.isNotEmpty(idList)) { + // 3. 这里是批量读取的优化，用一个主键值得in list查询，一步获取全部原有数据。然后再在内存中基于Map排序。 + List originalList = this.getInList(idList); + Map originalMap = originalList.stream() + .collect(toMap(c -> ReflectUtil.getFieldValue(c, idFieldName), c2 -> c2)); + // 迭代列表，传入当前最新数据和更新前数据进行比对，如果关联数据变化了，就对新数据进行合法性验证。 + for (M data : dataList) { + CallResult result = this.verifyRelatedData( + data, originalMap.get(ReflectUtil.getFieldValue(data, idFieldName))); + if (!result.isSuccess()) { + return result; + } + } + } else { + // 4. 迭代列表，传入当前最新数据，对关联数据进行合法性验证。 + for (M data : dataList) { + CallResult result = this.verifyRelatedData(data, null); + if (!result.isSuccess()) { + return result; + } + } + } + return CallResult.ok(); + } + /** * 集成所有与主表实体对象相关的关联数据列表。包括本地和远程服务的一对一、字典、一对多和多对多聚合运算等。 * 也可以根据实际需求，单独调用该函数所包含的各个数据集成函数。 @@ -1208,23 +1366,6 @@ public abstract class BaseService extends ServiceImpl } } - @Transactional(rollbackFor = Exception.class) - @Override - public void saveInternal(List dataList, Supplier idGenerator, Consumer> batchInserter) { - if (CollectionUtils.isEmpty(dataList)) { - return; - } - dataList.stream().filter(c -> ReflectUtil.getFieldValue(c, idFieldName) == null) - .forEach(o -> ReflectUtil.setFieldValue(o, idFieldName, idGenerator.get())); - if (batchInserter != null) { - batchInserter.accept(dataList); - } else { - for (M data : dataList) { - mapper().insert(data); - } - } - } - /** * 缺省实现返回null，在进行一对多和多对多聚合计算时，没有额外的自定义过滤条件。如有需要，需子类自行实现。 * @@ -1244,6 +1385,9 @@ public abstract class BaseService extends ServiceImpl * @return 需要关联验证返回true，否则false。 */ protected boolean needToVerify(M object, M originalObject, Function fieldGetter) { + if (object == null) { + return false; + } T data = fieldGetter.apply(object); if (data == null) { return false; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseDictService.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseDictService.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseDictService.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseDictService.java index e00a20cd..863153bb 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseDictService.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseDictService.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.base.service; +package com.orangeforms.common.core.base.service; import java.io.Serializable; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseService.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseService.java similarity index 80% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseService.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseService.java index 8cdfe15c..a1d53ce1 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/IBaseService.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseService.java @@ -1,12 +1,14 @@ -package com.orange.demo.common.core.base.service; +package com.orangeforms.common.core.base.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.orange.demo.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.TableModelInfo; import java.io.Serializable; import java.util.*; +import java.util.function.BiConsumer; import java.util.function.Consumer; -import java.util.function.Supplier; /** * 所有Service的接口。 @@ -18,6 +20,24 @@ import java.util.function.Supplier; */ public interface IBaseService extends IService{ + /** + * 如果主键存在则更新，否则新增保存实体对象。 + * + * @param data 实体对象数据。 + * @param saveNew 新增实体对象方法。 + * @param update 更新实体对象方法。 + */ + void saveNewOrUpdate(M data, Consumer saveNew, BiConsumer update); + + /** + * 如果主键存在的则更新，否则批量新增保存实体对象。 + * + * @param dataList 实体对象数据列表。 + * @param saveNewBatch 批量新增实体对象方法。 + * @param update 更新实体对象方法。 + */ + void saveNewOrUpdateBatch(List dataList, Consumer> saveNewBatch, BiConsumer update); + /** * 根据过滤条件删除数据。 * @@ -26,6 +46,29 @@ public interface IBaseService extends IService{ */ Integer removeBy(M filter); + /** + * 基于主从表之间的关联字段，批量改更新一对多从表数据。 + * 该操作会覆盖增、删、改三个操作，具体如下： + * 1. 先删除。从表中relationFieldName字段的值为relationFieldValue, 同时主键Id不在dataList中的。 + * 2. 再批量插入。遍历dataList中没有主键Id的对象，视为新对象批量插入。 + * 3. 最后逐条更新，遍历dataList中有主键Id的对象，视为已存在对象并逐条更新。 + * 4. 如果更新时间和更新用户Id为空，我们将视当前记录为变化数据，因此使用当前时间和用户分别填充这两个字段。 + * + * @param relationFieldName 主从表关联中，从表的Java字段名。 + * @param relationFieldValue 主从表关联中，与从表关联的主表字段值。该值会被赋值给从表关联字段。 + * @param updateUserIdFieldName 一对多从表的更新用户Id字段名。 + * @param updateTimeFieldName 一对多从表的更新时间字段名 + * @param dataList 批量更新的从表数据列表。 + * @param batchInserter 从表批量插入方法。 + */ + void updateBatchOneToManyRelation( + String relationFieldName, + Object relationFieldValue, + String updateUserIdFieldName, + String updateTimeFieldName, + List dataList, + Consumer> batchInserter); + /** * 判断指定字段的数据是否存在，且仅仅存在一条记录。 * 如果是基于主键的过滤，会直接调用existId过滤函数，提升性能。在有缓存的场景下，也可以利用缓存。 @@ -216,6 +259,25 @@ public interface IBaseService extends IService{ */ Integer getCountByCondition(String whereClause); + /** + * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 + * NOTE: BaseService中会给出返回CallResult.ok()的缺省实现。每个业务服务实现类在需要的时候可以重载该方法。 + * + * @param data 数据对象。 + * @param originalData 原有数据对象，null表示data为新增对象。 + * @return 应答结果对象。 + */ + CallResult verifyRelatedData(M data, M originalData); + + /** + * 根据最新对象列表和原有对象列表的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。 + * NOTE: BaseService中会给出返回CallResult.ok()的缺省实现。每个业务服务实现类在需要的时候可以重载该方法。 + * + * @param dataList 数据对象列表。 + * @return 应答结果对象。 + */ + CallResult verifyRelatedData(List dataList); + /** * 集成所有与主表实体对象相关的关联数据列表。包括一对一、字典、一对多和多对多聚合运算等。 * 也可以根据实际需求，单独调用该函数所包含的各个数据集成函数。 @@ -304,14 +366,9 @@ public interface IBaseService extends IService{ void loadRelationStruct(); /** - * 内部使用的批量保存方法。在使用前要确保清楚该方法的实现功能。 - * 该方法通常用于从表数据的批量更新，为了保证已有数据的主键不变，我们通常会在执行该方法前，根据主表的关联数据， - * 删除从表中的数据。之后在迭代参数dataList，并将没有主键值的对象视为新对象，该方法将为这些新对象生成主键值。 - * 其他包含主键值的对象，为已有对象，不做任何修改。填充主键后，将dataList集合中的数据批量插入到数据表。 + * 获取当前服务引用的实体对象及表信息。 * - * @param dataList 待操作的数据列表。 - * @param idGenerator 主键值生成器方法。 - * @param batchInserter 批量插入方法。 + * @return 实体对象及表信息。 */ - void saveInternal(List dataList, Supplier idGenerator, Consumer> batchInserter); + TableModelInfo getTableModelInfo(); } diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/DictionaryCache.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/DictionaryCache.java index 69ee83f5..b9852db1 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/DictionaryCache.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.cache; +package com.orangeforms.common.core.cache; import java.util.List; import java.util.Set; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapDictionaryCache.java similarity index 99% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapDictionaryCache.java index 77e2cbc5..c3d004e2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapDictionaryCache.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.cache; +package com.orangeforms.common.core.cache; -import com.orange.demo.common.core.exception.MapCacheAccessException; +import com.orangeforms.common.core.exception.MapCacheAccessException; import lombok.extern.slf4j.Slf4j; import java.util.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapTreeDictionaryCache.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapTreeDictionaryCache.java index c25f41de..b6ce356c 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapTreeDictionaryCache.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.cache; +package com.orangeforms.common.core.cache; -import com.orange.demo.common.core.exception.MapCacheAccessException; +import com.orangeforms.common.core.exception.MapCacheAccessException; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import lombok.extern.slf4j.Slf4j; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/CommonWebMvcConfig.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/CommonWebMvcConfig.java index 992285ad..cce1667a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/CommonWebMvcConfig.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.orange.demo.common.core.interceptor.MyRequestArgumentResolver; +import com.orangeforms.common.core.interceptor.MyRequestArgumentResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DataSourceContextHolder.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DataSourceContextHolder.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DataSourceContextHolder.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DataSourceContextHolder.java index 8d8ad22e..851f9fb9 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DataSourceContextHolder.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; /** * 通过线程本地存储的方式，保存当前数据库操作所需的数据源类型，动态数据源会根据该值，进行动态切换。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DynamicDataSource.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DynamicDataSource.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DynamicDataSource.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DynamicDataSource.java index 41b644cd..96bb93ab 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/DynamicDataSource.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/EncryptConfig.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/EncryptConfig.java index 60a22590..4ed08f54 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/EncryptConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/RestTemplateConfig.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/RestTemplateConfig.java index 581bc3f1..fd4edbc8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import org.apache.http.client.HttpClient; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/TomcatConfig.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/TomcatConfig.java index 543b7951..9e4358f8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/TomcatConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.config; +package com.orangeforms.common.core.config; import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityConstraint; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AggregationType.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AggregationType.java index b27595ff..ab47bb88 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AggregationType.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.constant; +package com.orangeforms.common.core.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AppDeviceType.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AppDeviceType.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AppDeviceType.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AppDeviceType.java index 22fbdbd4..9d4d7532 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AppDeviceType.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AppDeviceType.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.constant; +package com.orangeforms.common.core.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ApplicationConstant.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ApplicationConstant.java index 231d1019..2d504e50 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ApplicationConstant.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.constant; +package com.orangeforms.common.core.constant; /** * 应用程序的常量声明对象。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ErrorCodeEnum.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ErrorCodeEnum.java index a5a240c9..168f3751 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ErrorCodeEnum.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.constant; +package com.orangeforms.common.core.constant; /** * 返回应答中的错误代码和错误信息。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/GlobalDeletedFlag.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/GlobalDeletedFlag.java index f87266c1..a17c6e80 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/GlobalDeletedFlag.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.constant; +package com.orangeforms.common.core.constant; /** * 数据记录逻辑删除标记常量。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/DataValidationException.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/DataValidationException.java index 89c58c14..ecdee1c6 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/DataValidationException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * 数据验证失败的自定义异常。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidClassFieldException.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidClassFieldException.java index e444db0a..8ed84807 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidClassFieldException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataFieldException.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataFieldException.java index 26986d4f..ec884d7f 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataFieldException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataModelException.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataModelException.java index 0f9b6b73..a0a1fdf5 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataModelException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidRedisModeException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidRedisModeException.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidRedisModeException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidRedisModeException.java index 693d9b16..e59ea7e2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidRedisModeException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidRedisModeException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MapCacheAccessException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MapCacheAccessException.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MapCacheAccessException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MapCacheAccessException.java index 7b8f9c10..2d825116 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MapCacheAccessException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MapCacheAccessException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * 内存缓存访问失败。比如：获取分布式数据锁超时、等待线程中断等。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MyRuntimeException.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MyRuntimeException.java index 347e3ba2..faed272a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MyRuntimeException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * 自定义的运行时异常，在需要抛出运行时异常时，可使用该异常。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataAffectException.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataAffectException.java index 360e5e2c..65d15de8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataAffectException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * 没有数据被修改的自定义异常。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataPermException.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataPermException.java index 6d030556..e966ede2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataPermException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * 没有数据访问权限的自定义异常。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/RedisCacheAccessException.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/RedisCacheAccessException.java index 9ae324dc..ccd3e8d8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/RedisCacheAccessException.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.exception; +package com.orangeforms.common.core.exception; /** * Redis缓存访问失败。比如：获取分布式数据锁超时、等待线程中断等。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/interceptor/MyRequestArgumentResolver.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/interceptor/MyRequestArgumentResolver.java index 862d2ade..dcd7c3dc 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/interceptor/MyRequestArgumentResolver.java @@ -1,10 +1,10 @@ -package com.orange.demo.common.core.interceptor; +package com.orangeforms.common.core.interceptor; import cn.hutool.core.convert.Convert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.orange.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.core.MethodParameter; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/listener/LoadServiceRelationListener.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/listener/LoadServiceRelationListener.java index 9dae33ff..c069fb65 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/listener/LoadServiceRelationListener.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.listener; +package com.orangeforms.common.core.listener; -import com.orange.demo.common.core.base.service.BaseService; +import com.orangeforms.common.core.base.service.BaseService; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/CallResult.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/CallResult.java index 469b4d65..bea56b23 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/CallResult.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/DummyClass.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/DummyClass.java index 1daefb3f..146aaa09 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/DummyClass.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; /** * 哑元对象，主要用于注解中的缺省对象占位符。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/GlobalThreadLocal.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/GlobalThreadLocal.java index 67325ab6..51f1a49f 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/GlobalThreadLocal.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import cn.hutool.core.util.BooleanUtil; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/LoginUserInfo.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/LoginUserInfo.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/LoginUserInfo.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/LoginUserInfo.java index e0012f46..d27caf54 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/LoginUserInfo.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/LoginUserInfo.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import lombok.Data; import lombok.ToString; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupCriteria.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupCriteria.java index 5453efce..08ef33ad 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupCriteria.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupParam.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupParam.java index 671cf70c..368d60ef 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupParam.java @@ -1,11 +1,11 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import cn.hutool.core.util.ReflectUtil; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.exception.InvalidClassFieldException; -import com.orange.demo.common.core.exception.InvalidDataFieldException; -import com.orange.demo.common.core.exception.InvalidDataModelException; -import com.orange.demo.common.core.util.MyModelUtil; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.exception.InvalidClassFieldException; +import com.orangeforms.common.core.exception.InvalidDataFieldException; +import com.orangeforms.common.core.exception.InvalidDataModelException; +import com.orangeforms.common.core.util.MyModelUtil; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyOrderParam.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyOrderParam.java index 437e8dfb..f1b24810 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyOrderParam.java @@ -1,11 +1,11 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import cn.hutool.core.util.ReflectUtil; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.exception.InvalidClassFieldException; -import com.orange.demo.common.core.exception.InvalidDataFieldException; -import com.orange.demo.common.core.exception.InvalidDataModelException; -import com.orange.demo.common.core.util.MyModelUtil; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.exception.InvalidClassFieldException; +import com.orangeforms.common.core.exception.InvalidDataFieldException; +import com.orangeforms.common.core.exception.InvalidDataModelException; +import com.orangeforms.common.core.util.MyModelUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageData.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageData.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageData.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageData.java index fd21f943..13f3e588 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageData.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageData.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageParam.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageParam.java index 18838c97..4a6a4569 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageParam.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import lombok.Getter; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyRelationParam.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyRelationParam.java index 559027e9..f3061080 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyRelationParam.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import lombok.Builder; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyWhereCriteria.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyWhereCriteria.java index 27429859..85bfff9e 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyWhereCriteria.java @@ -1,10 +1,10 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.annotation.JSONField; -import com.orange.demo.common.core.exception.InvalidDataFieldException; -import com.orange.demo.common.core.exception.InvalidDataModelException; -import com.orange.demo.common.core.util.MyModelUtil; +import com.orangeforms.common.core.exception.InvalidDataFieldException; +import com.orangeforms.common.core.exception.InvalidDataModelException; +import com.orangeforms.common.core.util.MyModelUtil; import lombok.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/ResponseResult.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/ResponseResult.java index b83b5ec0..7923dc6d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/ResponseResult.java @@ -1,8 +1,8 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; import com.alibaba.fastjson.JSON; -import com.orange.demo.common.core.constant.ErrorCodeEnum; -import com.orange.demo.common.core.util.ContextUtil; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.util.ContextUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -77,6 +77,20 @@ public class ResponseResult { return errorCode == null ? success() : error(errorCode, errorMessage); } + /** + * 根据参数errorCodeEnum的枚举值，判断创建成功对象还是错误对象。 + * 如果返回错误对象，errorCode 和 errorMessage 分别取自于参数 errorCodeEnum 的 name() 和参数 errorMessage。 + * + * @param errorCodeEnum 错误码枚举。 + * @param errorMessage 如果该参数为null，错误信息取自errorCodeEnum参数内置的errorMessage，否则使用当前参数。 + * @param data 如果错误枚举值为NO_ERROR，则返回该数据。 + * @return 返回创建的ResponseResult实例对象 + */ + public static ResponseResult create(ErrorCodeEnum errorCodeEnum, String errorMessage, T data) { + errorMessage = errorMessage != null ? errorMessage : errorCodeEnum.getErrorMessage(); + return errorCodeEnum == ErrorCodeEnum.NO_ERROR ? success(data) : error(errorCodeEnum.name(), errorMessage); + } + /** * 创建成功对象。 * 如果需要绑定返回数据，可以在实例化后调用setDataObject方法。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TableModelInfo.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TableModelInfo.java new file mode 100644 index 00000000..9d58c29b --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TableModelInfo.java @@ -0,0 +1,33 @@ +package com.orangeforms.common.core.object; + +import lombok.Data; + +/** + * 数据表模型基础信息。 + * + * @author Jerry + * @date 2020-09-24 + */ +@Data +public class TableModelInfo { + + /** + * 数据表名。 + */ + private String tableName; + + /** + * 实体对象名。 + */ + private String modelName; + + /** + * 主键的表字段名。 + */ + private String keyColumnName; + + /** + * 主键在实体对象中的属性名。 + */ + private String keyFieldName; +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TokenData.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TokenData.java index 0b084335..946e008f 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TokenData.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; -import com.orange.demo.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.ContextUtil; import lombok.Data; import lombok.ToString; @@ -25,11 +25,19 @@ public class TokenData { * 用户Id。 */ private Long userId; + /** + * 用户所属角色。多个角色之间逗号分隔。 + */ + private String roleIds; /** * 用户所在部门Id。 * 仅当系统支持uaa时可用，否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。 */ private Long deptId; + /** + * 用户所属岗位Id。多个岗位之间逗号分隔。仅当系统支持岗位时有值。 + */ + private String postIds; /** * 用户的部门岗位Id。多个岗位之间逗号分隔。仅当系统支持岗位时有值。 */ diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/Tuple2.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/Tuple2.java index 15d04ae0..c2574b8c 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/Tuple2.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.object; +package com.orangeforms.common.core.object; /** * 二元组对象。主要用于可以一次返回多个结果的场景，同时还能避免强制转换。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/BaseUpDownloader.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/BaseUpDownloader.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/BaseUpDownloader.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/BaseUpDownloader.java index 9398f1fb..e923f993 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/BaseUpDownloader.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/BaseUpDownloader.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; import com.alibaba.fastjson.JSON; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.util.ContextUtil; -import com.orange.demo.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.MyCommonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/LocalUpDownloader.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/LocalUpDownloader.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/LocalUpDownloader.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/LocalUpDownloader.java index 444ef8be..318502ce 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/LocalUpDownloader.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/LocalUpDownloader.java @@ -1,7 +1,7 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; import com.alibaba.fastjson.JSON; -import com.orange.demo.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.constant.ErrorCodeEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UpDownloaderFactory.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UpDownloaderFactory.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UpDownloaderFactory.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UpDownloaderFactory.java index de3b7efd..7a880718 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UpDownloaderFactory.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UpDownloaderFactory.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; import org.springframework.stereotype.Component; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadResponseInfo.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadResponseInfo.java similarity index 91% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadResponseInfo.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadResponseInfo.java index 81ef267c..5011642a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadResponseInfo.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadResponseInfo.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreInfo.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreInfo.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreInfo.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreInfo.java index ea873fb4..bad6cda5 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreInfo.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreInfo.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreTypeEnum.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreTypeEnum.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreTypeEnum.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreTypeEnum.java index b235fed5..0d54f294 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreTypeEnum.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreTypeEnum.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.upload; +package com.orangeforms.common.core.upload; /** * 上传数据存储介质类型枚举。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/AopTargetUtil.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/AopTargetUtil.java index 3e4624bf..b4778778 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/AopTargetUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.framework.AdvisedSupport; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ApplicationContextHolder.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ApplicationContextHolder.java index f1634239..6bc29fae 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ApplicationContextHolder.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; -import com.orange.demo.common.core.exception.MyRuntimeException; +import com.orangeforms.common.core.exception.MyRuntimeException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.lang.NonNull; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ContextUtil.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ContextUtil.java index b5e77a60..1519aa55 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ContextUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/DataSourceResolver.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/DataSourceResolver.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/DataSourceResolver.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/DataSourceResolver.java index fec8289a..b0110cca 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/DataSourceResolver.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/DataSourceResolver.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; /** * 基于自定义解析规则的多数据源解析接口。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ExportUtil.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ExportUtil.java index 656d1a0c..fd1ead6e 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ExportUtil.java @@ -1,11 +1,11 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import cn.jimmyshi.beanquery.BeanQuery; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.exception.MyRuntimeException; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.exception.MyRuntimeException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.csv.CSVFormat; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/IpUtil.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/IpUtil.java index 8ed8e3d5..2e55c64c 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/IpUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -37,6 +37,9 @@ public class IpUtil { // Proxy-Client-IP：apache 服务代理 ipAddresses = request.getHeader("Proxy-Client-IP"); } + if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) { + ipAddresses = request.getHeader("HTTP_X_FORWARDED_FOR"); + } if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) { // WL-Proxy-Client-IP：weblogic 服务代理 ipAddresses = request.getHeader("WL-Proxy-Client-IP"); diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/JwtUtil.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/JwtUtil.java index 72f1b963..4bde83a2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/JwtUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/LogMessageUtil.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/LogMessageUtil.java index a806a965..d2f4656b 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/LogMessageUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; /** * 拼接日志消息的工具类。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyCommonUtil.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyCommonUtil.java index 99f22146..9e2a4901 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyCommonUtil.java @@ -1,12 +1,12 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; -import com.orange.demo.common.core.constant.AppDeviceType; -import com.orange.demo.common.core.validator.AddGroup; -import com.orange.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.constant.AppDeviceType; +import com.orangeforms.common.core.validator.AddGroup; +import com.orangeforms.common.core.validator.UpdateGroup; import javax.validation.ConstraintViolation; import javax.validation.Validation; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyDateUtil.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyDateUtil.java index f3c4fcc0..b56704c6 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyDateUtil.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; -import com.orange.demo.common.core.object.Tuple2; +import com.orangeforms.common.core.object.Tuple2; import org.apache.commons.lang3.time.DateUtils; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyModelUtil.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyModelUtil.java index 82cc79b6..d59a8447 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyModelUtil.java @@ -1,14 +1,14 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.exception.InvalidDataFieldException; -import com.orange.demo.common.core.annotation.*; -import com.orange.demo.common.core.exception.MyRuntimeException; -import com.orange.demo.common.core.object.TokenData; -import com.orange.demo.common.core.object.Tuple2; -import com.orange.demo.common.core.upload.UploadStoreInfo; +import com.orangeforms.common.core.exception.InvalidDataFieldException; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.exception.MyRuntimeException; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.object.Tuple2; +import com.orangeforms.common.core.upload.UploadStoreInfo; import com.google.common.base.CaseFormat; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyPageUtil.java similarity index 94% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyPageUtil.java index 14ab2b67..2215f383 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyPageUtil.java @@ -1,12 +1,12 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import cn.jimmyshi.beanquery.BeanQuery; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.Page; import org.apache.commons.collections4.CollectionUtils; -import com.orange.demo.common.core.base.mapper.BaseModelMapper; -import com.orange.demo.common.core.object.MyPageData; -import com.orange.demo.common.core.object.Tuple2; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.core.object.MyPageData; +import com.orangeforms.common.core.object.Tuple2; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RedisKeyUtil.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RedisKeyUtil.java index 127bc0a5..a365ea37 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RedisKeyUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; /** * Redis 键生成工具类。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RsaUtil.java similarity index 99% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RsaUtil.java index 1c633ad8..08279390 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RsaUtil.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import javax.crypto.Cipher; import java.nio.charset.StandardCharsets; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/TreeNode.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/TreeNode.java index 610beb57..bff683e4 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/TreeNode.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.util; +package com.orangeforms.common.core.util; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/AddGroup.java similarity index 75% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/AddGroup.java index cfcfc4d8..02440a1a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/AddGroup.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; /** * 数据增加的验证分组。通常用于数据新增场景。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictRef.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictRef.java index 46e69d43..a288d33e 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictRef.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictValidator.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictValidator.java index aba63630..435cbdd5 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictValidator.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; import cn.hutool.core.util.ReflectUtil; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLength.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLength.java index f3c5a99a..493f39c8 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLength.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLengthValidator.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLengthValidator.java index 60f0b17b..b85c5818 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLengthValidator.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; import org.apache.commons.lang3.CharUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/UpdateGroup.java similarity index 76% rename from orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java rename to orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/UpdateGroup.java index a61fb8f9..af6466cb 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java +++ b/orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/UpdateGroup.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.core.validator; +package com.orangeforms.common.core.validator; /** * 数据修改的验证分组。通常用于数据更新的场景。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-datafilter/pom.xml index bb2ea39e..e791d2f7 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.orange.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,12 +16,12 @@ - com.orange.demo + com.orangeforms common-core 1.0.0 - com.orange.demo + com.orangeforms common-redis 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/aop/DisableDataFilterAspect.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/aop/DisableDataFilterAspect.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/aop/DisableDataFilterAspect.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/aop/DisableDataFilterAspect.java index 7b227e5a..6218a9c1 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/aop/DisableDataFilterAspect.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/aop/DisableDataFilterAspect.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.datafilter.aop; +package com.orangeforms.common.datafilter.aop; -import com.orange.demo.common.core.object.GlobalThreadLocal; +import com.orangeforms.common.core.object.GlobalThreadLocal; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -24,7 +24,7 @@ public class DisableDataFilterAspect { /** * 所有标记了DisableDataFilter注解的方法。 */ - @Pointcut("@annotation(com.orange.demo.common.core.annotation.DisableDataFilter)") + @Pointcut("@annotation(com.orangeforms.common.core.annotation.DisableDataFilter)") public void disableDataFilterPointCut() { // 空注释，避免sonar警告 } diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterAutoConfig.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterAutoConfig.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterAutoConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterAutoConfig.java index 13d41c93..653fca09 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterAutoConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterAutoConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.datafilter.config; +package com.orangeforms.common.datafilter.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterProperties.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterProperties.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterProperties.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterProperties.java index 6e681e05..0e4114bf 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterProperties.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterProperties.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.datafilter.config; +package com.orangeforms.common.datafilter.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterWebMvcConfigurer.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterWebMvcConfigurer.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterWebMvcConfigurer.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterWebMvcConfigurer.java index dd7d76f0..c08c3af2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterWebMvcConfigurer.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterWebMvcConfigurer.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.datafilter.config; +package com.orangeforms.common.datafilter.config; -import com.orange.demo.common.datafilter.interceptor.DataFilterInterceptor; +import com.orangeforms.common.datafilter.interceptor.DataFilterInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/constant/DataPermRuleType.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/constant/DataPermRuleType.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/constant/DataPermRuleType.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/constant/DataPermRuleType.java index 0007b0d6..b0eb4023 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/constant/DataPermRuleType.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/constant/DataPermRuleType.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.datafilter.constant; +package com.orangeforms.common.datafilter.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/DataFilterInterceptor.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/DataFilterInterceptor.java similarity index 93% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/DataFilterInterceptor.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/DataFilterInterceptor.java index 74262841..0016112a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/DataFilterInterceptor.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/DataFilterInterceptor.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.datafilter.interceptor; +package com.orangeforms.common.datafilter.interceptor; -import com.orange.demo.common.core.object.GlobalThreadLocal; +import com.orangeforms.common.core.object.GlobalThreadLocal; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/MybatisDataFilterInterceptor.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/MybatisDataFilterInterceptor.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/MybatisDataFilterInterceptor.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/MybatisDataFilterInterceptor.java index 07cc9f87..fffc190a 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/MybatisDataFilterInterceptor.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/MybatisDataFilterInterceptor.java @@ -1,20 +1,20 @@ -package com.orange.demo.common.datafilter.interceptor; +package com.orangeforms.common.datafilter.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableName; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.annotation.*; -import com.orange.demo.common.core.exception.NoDataPermException; -import com.orange.demo.common.core.object.GlobalThreadLocal; -import com.orange.demo.common.core.object.TokenData; -import com.orange.demo.common.core.util.ApplicationContextHolder; -import com.orange.demo.common.core.util.ContextUtil; -import com.orange.demo.common.core.util.MyModelUtil; -import com.orange.demo.common.core.util.RedisKeyUtil; -import com.orange.demo.common.datafilter.config.DataFilterProperties; -import com.orange.demo.common.datafilter.constant.DataPermRuleType; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.annotation.*; +import com.orangeforms.common.core.exception.NoDataPermException; +import com.orangeforms.common.core.object.GlobalThreadLocal; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.RedisKeyUtil; +import com.orangeforms.common.datafilter.config.DataFilterProperties; +import com.orangeforms.common.datafilter.constant.DataPermRuleType; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; @@ -74,7 +74,6 @@ public class MybatisDataFilterInterceptor implements Interceptor { /** * 预先加载与数据过滤相关的数据到缓存，该函数会在(LoadDataFilterInfoListener)监听器中调用。 */ - @SuppressWarnings("all") public void loadInfoWithDataFilter() { Map mapperMap = ApplicationContextHolder.getApplicationContext().getBeansOfType(BaseDaoMapper.class); @@ -257,6 +256,7 @@ public class MybatisDataFilterInterceptor implements Interceptor { } } } + log.info("Tenant Filter Where Clause [{}]", dataFilter); ReflectUtil.setFieldValue(boundSql, "sql", statement.toString()); return statement; } @@ -340,6 +340,7 @@ public class MybatisDataFilterInterceptor implements Interceptor { } } } + log.info("DataPerm Filter Where Clause [{}]", dataFilter); ReflectUtil.setFieldValue(boundSql, "sql", statement.toString()); } diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/listener/LoadDataFilterInfoListener.java b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/listener/LoadDataFilterInfoListener.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/listener/LoadDataFilterInfoListener.java rename to orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/listener/LoadDataFilterInfoListener.java index f2dc2dde..ce7684dd 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/listener/LoadDataFilterInfoListener.java +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/listener/LoadDataFilterInfoListener.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.datafilter.listener; +package com.orangeforms.common.datafilter.listener; -import com.orange.demo.common.datafilter.interceptor.MybatisDataFilterInterceptor; +import com.orangeforms.common.datafilter.interceptor.MybatisDataFilterInterceptor; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; diff --git a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/resources/META-INF/spring.factories b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/resources/META-INF/spring.factories index e20abffd..e9628e63 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/resources/META-INF/spring.factories +++ b/orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.orange.demo.common.datafilter.config.DataFilterAutoConfig \ No newline at end of file +com.orangeforms.common.datafilter.config.DataFilterAutoConfig \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-log/pom.xml index c8f41f6b..d5b6e39b 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-log/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.orange.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.orange.demo + com.orangeforms common-sequence 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/annotation/OperationLog.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/annotation/OperationLog.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java index 267fb2db..b282c2c9 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/annotation/OperationLog.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.log.annotation; +package com.orangeforms.common.log.annotation; -import com.orange.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import java.lang.annotation.*; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/aop/OperationLogAspect.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/aop/OperationLogAspect.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java index 925cb977..e7a03638 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/aop/OperationLogAspect.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java @@ -1,20 +1,20 @@ -package com.orange.demo.common.log.aop; +package com.orangeforms.common.log.aop; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.object.ResponseResult; -import com.orange.demo.common.core.object.TokenData; -import com.orange.demo.common.core.util.ContextUtil; -import com.orange.demo.common.core.util.IpUtil; -import com.orange.demo.common.core.util.MyCommonUtil; -import com.orange.demo.common.log.annotation.OperationLog; -import com.orange.demo.common.log.config.OperationLogProperties; -import com.orange.demo.common.log.model.SysOperationLog; -import com.orange.demo.common.log.model.constant.SysOperationLogType; -import com.orange.demo.common.log.service.SysOperationLogService; -import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.IpUtil; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.config.OperationLogProperties; +import com.orangeforms.common.log.model.SysOperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.service.SysOperationLogService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; @@ -63,7 +63,7 @@ public class OperationLogAspect { /** * 所有controller方法。 */ - @Pointcut("execution(public * com.orange.demo..controller..*(..))") + @Pointcut("execution(public * com.orangeforms..controller..*(..))") public void operationLogPointCut() { // 空注释，避免sonar警告 } @@ -80,7 +80,7 @@ public class OperationLogAspect { response.setHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId); MDC.put(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId); TokenData tokenData = TokenData.takeFromRequest(); - // 为log4j2日志设定变量，使日志可以输出更多有价值的信息。 + // 为日志框架设定变量，使日志可以输出更多有价值的信息。 if (tokenData != null) { MDC.put("sessionId", tokenData.getSessionId()); MDC.put("userId", tokenData.getUserId().toString()); @@ -129,6 +129,11 @@ public class OperationLogAspect { operationLog.setElapse(System.currentTimeMillis() - start); operationLogService.saveNewAsync(operationLog); } + MDC.remove(ApplicationConstant.HTTP_HEADER_TRACE_ID); + if (tokenData != null) { + MDC.remove("sessionId"); + MDC.remove("userId"); + } } return result; } diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/CommonLogAutoConfig.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java similarity index 86% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/CommonLogAutoConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java index e27c4bad..4878ff34 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/CommonLogAutoConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.log.config; +package com.orangeforms.common.log.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/OperationLogProperties.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/OperationLogProperties.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java index 96282c44..131735b6 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/config/OperationLogProperties.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.log.config; +package com.orangeforms.common.log.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/SysOperationLogMapper.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/SysOperationLogMapper.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java index 7a99f1f8..6e1884cb 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/SysOperationLogMapper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java @@ -1,7 +1,7 @@ -package com.orange.demo.common.log.dao; +package com.orangeforms.common.log.dao; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.log.model.SysOperationLog; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.log.model.SysOperationLog; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/mapper/SysOperationLogMapper.xml b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/mapper/SysOperationLogMapper.xml rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml index 37749eaf..891a882d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/mapper/SysOperationLogMapper.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -87,7 +87,7 @@ - SELECT * FROM zz_sys_operation_log diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/SysOperationLog.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/SysOperationLog.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java index 594d31c0..a278d4f5 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/SysOperationLog.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java @@ -1,7 +1,7 @@ -package com.orange.demo.common.log.model; +package com.orangeforms.common.log.model; import com.baomidou.mybatisplus.annotation.*; -import com.orange.demo.common.core.annotation.TenantFilterColumn; +import com.orangeforms.common.core.annotation.TenantFilterColumn; import lombok.Data; import java.util.Date; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/constant/SysOperationLogType.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java similarity index 84% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/constant/SysOperationLogType.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java index 4a2a7d31..1c0908bd 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/model/constant/SysOperationLogType.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.log.model.constant; +package com.orangeforms.common.log.model.constant; import java.util.HashMap; import java.util.Map; @@ -86,23 +86,27 @@ public final class SysOperationLogType { /** * 启动流程。 */ - public static final int START_PROCESS = 100; + public static final int START_FLOW = 100; /** * 停止流程。 */ - public static final int STOP_PROCESS = 105; + public static final int STOP_FLOW = 105; /** * 删除流程。 */ - public static final int DELETE_PROCESS = 110; + public static final int DELETE_FLOW = 110; /** * 取消流程。 */ - public static final int CANCEL_PROCESS = 115; + public static final int CANCEL_FLOW = 115; /** * 提交任务。 */ public static final int SUBMIT_TASK = 120; + /** + * 催办任务。 + */ + public static final int REMIND_TASK = 125; private static final Map DICT_MAP = new HashMap<>(15); static { @@ -124,11 +128,12 @@ public final class SysOperationLogType { DICT_MAP.put(UNPUBLISH, "取消发布"); DICT_MAP.put(SUSPEND, "暂停"); DICT_MAP.put(RESUME, "恢复"); - DICT_MAP.put(START_PROCESS, "启动流程"); - DICT_MAP.put(STOP_PROCESS, "停止流程"); - DICT_MAP.put(DELETE_PROCESS, "删除流程"); - DICT_MAP.put(CANCEL_PROCESS, "取消流程"); + DICT_MAP.put(START_FLOW, "启动流程"); + DICT_MAP.put(STOP_FLOW, "停止流程"); + DICT_MAP.put(DELETE_FLOW, "删除流程"); + DICT_MAP.put(CANCEL_FLOW, "取消流程"); DICT_MAP.put(SUBMIT_TASK, "提交任务"); + DICT_MAP.put(REMIND_TASK, "催办任务"); } /** diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/SysOperationLogService.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/SysOperationLogService.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java index 4cc76186..0ae8df90 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/SysOperationLogService.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java @@ -1,7 +1,7 @@ -package com.orange.demo.common.log.service; +package com.orangeforms.common.log.service; -import com.orange.demo.common.core.base.service.IBaseService; -import com.orange.demo.common.log.model.SysOperationLog; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.log.model.SysOperationLog; import java.util.List; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/impl/SysOperationLogServiceImpl.java b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/impl/SysOperationLogServiceImpl.java rename to orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java index 697cb9bc..6f777eaf 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orange/demo/common/log/service/impl/SysOperationLogServiceImpl.java +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.orange.demo.common.log.service.impl; +package com.orangeforms.common.log.service.impl; -import com.orange.demo.common.core.annotation.MyDataSource; -import com.orange.demo.common.core.base.dao.BaseDaoMapper; -import com.orange.demo.common.core.base.service.BaseService; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.log.dao.SysOperationLogMapper; -import com.orange.demo.common.log.model.SysOperationLog; -import com.orange.demo.common.log.service.SysOperationLogService; +import com.orangeforms.common.core.annotation.MyDataSource; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.log.dao.SysOperationLogMapper; +import com.orangeforms.common.log.model.SysOperationLog; +import com.orangeforms.common.log.service.SysOperationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories index 9f0ac5c9..c1551ebc 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories +++ b/orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.orange.demo.common.log.config.CommonLogAutoConfig \ No newline at end of file +com.orangeforms.common.log.config.CommonLogAutoConfig \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-redis/pom.xml index 7b88b0fe..c0fe169d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.orange.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.orange.demo + com.orangeforms common-core 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisDictionaryCache.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java rename to orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisDictionaryCache.java index 9d2908cc..9647daa6 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisDictionaryCache.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.redis.cache; +package com.orangeforms.common.redis.cache; import com.alibaba.fastjson.JSON; -import com.orange.demo.common.core.cache.DictionaryCache; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.exception.RedisCacheAccessException; +import com.orangeforms.common.core.cache.DictionaryCache; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.exception.RedisCacheAccessException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.redisson.api.RMap; diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisTreeDictionaryCache.java similarity index 98% rename from orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java rename to orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisTreeDictionaryCache.java index d900185a..947aacdd 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisTreeDictionaryCache.java @@ -1,9 +1,9 @@ -package com.orange.demo.common.redis.cache; +package com.orangeforms.common.redis.cache; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import com.orange.demo.common.core.constant.ApplicationConstant; -import com.orange.demo.common.core.exception.RedisCacheAccessException; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.exception.RedisCacheAccessException; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; import org.apache.commons.collections4.CollectionUtils; diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedissonCacheConfig.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedissonCacheConfig.java index 9275204a..3ffa36a2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedissonCacheConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.redis.cache; +package com.orangeforms.common.redis.cache; import com.google.common.collect.Maps; import org.redisson.api.RedissonClient; diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/SessionCacheHelper.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java rename to orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/SessionCacheHelper.java index 83537deb..0fadf506 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/SessionCacheHelper.java @@ -1,6 +1,6 @@ -package com.orange.demo.common.redis.cache; +package com.orangeforms.common.redis.cache; -import com.orange.demo.common.core.object.TokenData; +import com.orangeforms.common.core.object.TokenData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/config/RedissonConfig.java similarity index 88% rename from orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/config/RedissonConfig.java index d20eecc4..9d31902d 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/config/RedissonConfig.java @@ -1,8 +1,8 @@ -package com.orange.demo.common.redis.config; +package com.orangeforms.common.redis.config; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.orange.demo.common.core.exception.InvalidRedisModeException; +import com.orangeforms.common.core.exception.InvalidRedisModeException; import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; @@ -69,7 +69,8 @@ public class RedissonConfig { .setPassword(password) .addNodeAddress(clusterAddresses) .setConnectTimeout(timeout) - .setMasterConnectionPoolSize(poolSize); + .setMasterConnectionPoolSize(poolSize) + .setMasterConnectionMinimumIdleSize(minIdle); } else if ("sentinel".equals(mode)) { String[] sentinelAddresses = StrUtil.splitToArray(address, ','); config.setLockWatchdogTimeout(lockWatchdogTimeout) @@ -78,7 +79,8 @@ public class RedissonConfig { .setMasterName(masterName) .addSentinelAddress(sentinelAddresses) .setConnectTimeout(timeout) - .setMasterConnectionPoolSize(poolSize); + .setMasterConnectionPoolSize(poolSize) + .setMasterConnectionMinimumIdleSize(minIdle); } else if ("master-slave".equals(mode)) { String[] masterSlaveAddresses = StrUtil.splitToArray(address, ','); if (masterSlaveAddresses.length == 1) { @@ -93,7 +95,8 @@ public class RedissonConfig { .setMasterAddress(masterSlaveAddresses[0]) .addSlaveAddress(slaveAddresses) .setConnectTimeout(timeout) - .setMasterConnectionPoolSize(poolSize); + .setMasterConnectionPoolSize(poolSize) + .setMasterConnectionMinimumIdleSize(minIdle); } else { throw new InvalidRedisModeException(mode); } diff --git a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories index 75dbbc35..f24e3d92 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories +++ b/orange-demo-single/orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.orange.demo.common.redis.config.RedissonConfig \ No newline at end of file +com.orangeforms.common.redis.config.RedissonConfig \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-sequence/pom.xml index 6c801e67..36502af3 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.orange.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.orange.demo + com.orangeforms common-core 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfig.java b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorAutoConfig.java similarity index 85% rename from orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfig.java rename to orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorAutoConfig.java index b5fdaeb3..a605b16f 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfig.java +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorAutoConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.sequence.config; +package com.orangeforms.common.sequence.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorProperties.java similarity index 90% rename from orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java rename to orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorProperties.java index 5337e5ef..3ff02c2f 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorProperties.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.sequence.config; +package com.orangeforms.common.sequence.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/BasicIdGenerator.java similarity index 96% rename from orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java rename to orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/BasicIdGenerator.java index 49448d8a..9cf08aa2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/BasicIdGenerator.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.sequence.generator; +package com.orangeforms.common.sequence.generator; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdUtil; diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/MyIdGenerator.java similarity index 87% rename from orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java rename to orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/MyIdGenerator.java index e3dfeb4e..ec1d13d2 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/MyIdGenerator.java @@ -1,4 +1,4 @@ -package com.orange.demo.common.sequence.generator; +package com.orangeforms.common.sequence.generator; /** * 分布式Id生成器的统一接口。 diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/wrapper/IdGeneratorWrapper.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java rename to orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/wrapper/IdGeneratorWrapper.java index 0486e4d4..42796f10 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/wrapper/IdGeneratorWrapper.java @@ -1,8 +1,8 @@ -package com.orange.demo.common.sequence.wrapper; +package com.orangeforms.common.sequence.wrapper; -import com.orange.demo.common.sequence.config.IdGeneratorProperties; -import com.orange.demo.common.sequence.generator.BasicIdGenerator; -import com.orange.demo.common.sequence.generator.MyIdGenerator; +import com.orangeforms.common.sequence.config.IdGeneratorProperties; +import com.orangeforms.common.sequence.generator.BasicIdGenerator; +import com.orangeforms.common.sequence.generator.MyIdGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/resources/META-INF/spring.factories b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/resources/META-INF/spring.factories index c7dc705e..dd267e85 100644 --- a/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/resources/META-INF/spring.factories +++ b/orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.orange.demo.common.sequence.config.IdGeneratorAutoConfig \ No newline at end of file +com.orangeforms.common.sequence.config.IdGeneratorAutoConfig \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/pom.xml b/orange-demo-single/orange-demo-single-service/common/common-swagger/pom.xml new file mode 100644 index 00000000..c1e9bcde --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/pom.xml @@ -0,0 +1,39 @@ + + + + common + com.orangeforms + 1.0.0 + + 4.0.0 + + common-swagger + 1.0.0 + common-swagger + jar + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + org.springframework.plugin + spring-plugin-core + + + org.springframework.plugin + spring-plugin-metadata + + + + + com.orangeforms + common-core + 1.0.0 + + + \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerAutoConfiguration.java b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerAutoConfiguration.java new file mode 100644 index 00000000..9fb7f904 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerAutoConfiguration.java @@ -0,0 +1,56 @@ +package com.orangeforms.common.swagger.config; + +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +/** + * 自动加载bean的配置对象。 + * + * @author Jerry + * @date 2020-09-24 + */ +@EnableSwagger2WebMvc +@EnableKnife4j +@EnableConfigurationProperties(SwaggerProperties.class) +@ConditionalOnProperty(prefix = "swagger", name = "enabled") +public class SwaggerAutoConfiguration { + + @Bean + public Docket upmsDocket(SwaggerProperties properties) { + return new Docket(DocumentationType.SWAGGER_2) + .groupName("1. 用户权限分组接口") + .ignoredParameterTypes(MyRequestBody.class) + .apiInfo(apiInfo(properties)) + .select() + .apis(RequestHandlerSelectors.basePackage(properties.getServiceBasePackage() + ".upms.controller")) + .paths(PathSelectors.any()).build(); + } + + @Bean + public Docket bizDocket(SwaggerProperties properties) { + return new Docket(DocumentationType.SWAGGER_2) + .groupName("2. 业务应用分组接口") + .ignoredParameterTypes(MyRequestBody.class) + .apiInfo(apiInfo(properties)) + .select() + .apis(RequestHandlerSelectors.basePackage(properties.getServiceBasePackage() + ".app.controller")) + .paths(PathSelectors.any()).build(); + } + + private ApiInfo apiInfo(SwaggerProperties properties) { + return new ApiInfoBuilder() + .title(properties.getTitle()) + .description(properties.getDescription()) + .version(properties.getVersion()).build(); + } +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerProperties.java b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerProperties.java new file mode 100644 index 00000000..bc6f964c --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerProperties.java @@ -0,0 +1,45 @@ +package com.orangeforms.common.swagger.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 配置参数对象。 + * + * @author Jerry + * @date 2020-09-24 + */ +@Data +@ConfigurationProperties("swagger") +public class SwaggerProperties { + + /** + * 是否开启Swagger。 + */ + private Boolean enabled; + + /** + * Swagger解析的基础包路径。 + **/ + private String basePackage = ""; + + /** + * Swagger解析的服务包路径。 + **/ + private String serviceBasePackage = ""; + + /** + * ApiInfo中的标题。 + **/ + private String title = ""; + + /** + * ApiInfo中的描述信息。 + **/ + private String description = ""; + + /** + * ApiInfo中的版本信息。 + **/ + private String version = ""; +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/ByteBuddyUtil.java b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/ByteBuddyUtil.java new file mode 100644 index 00000000..c43d9171 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/ByteBuddyUtil.java @@ -0,0 +1,85 @@ +package com.orangeforms.common.swagger.plugin; + +import cn.hutool.core.lang.Assert; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.github.xiaoymin.knife4j.core.conf.Consts; +import javassist.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import springfox.documentation.service.ResolvedMethodParameter; + +import java.util.List; + +/** + * 通过字节码方式动态创建接口参数封装对象。 + * + * @author Jerry + * @date 2020-09-24 + */ +@Slf4j +class ByteBuddyUtil { + private static final ClassPool CLASS_POOL = ClassPool.getDefault(); + + static Class createDynamicModelClass(String name, List parameters) { + String clazzName = Consts.BASE_PACKAGE_PREFIX + name; + try { + CtClass tmp = CLASS_POOL.getCtClass(clazzName); + if (tmp != null) { + tmp.detach(); + } + } catch (NotFoundException e) { + // 需要吃掉这个异常。 + } + CtClass ctClass = CLASS_POOL.makeClass(clazzName); + try { + int fieldCount = 0; + for (ResolvedMethodParameter dynamicParameter : parameters) { + // 因为在调用这个方法之前，这些参数都包含MyRequestBody注解。 + MyRequestBody myRequestBody = + dynamicParameter.findAnnotation(MyRequestBody.class).orElse(null); + Assert.notNull(myRequestBody); + String fieldName = dynamicParameter.defaultName().isPresent() + ? dynamicParameter.defaultName().get() : "parameter"; + if (StringUtils.isNotBlank(myRequestBody.value())) { + fieldName = myRequestBody.value(); + } + ctClass.addField(createField(dynamicParameter, fieldName, ctClass)); + fieldCount++; + } + if (fieldCount > 0) { + return ctClass.toClass(); + } + } catch (Throwable e) { + log.error(e.getMessage()); + } + return null; + } + + private static CtField createField(ResolvedMethodParameter parameter, String parameterName, CtClass ctClass) + throws NotFoundException, CannotCompileException { + CtField field = new CtField(getFieldType(parameter.getParameterType().getErasedType()), parameterName, ctClass); + field.setModifiers(Modifier.PUBLIC); + return field; + } + + private static CtClass getFieldType(Class propetyType) { + CtClass fieldType = null; + try { + if (!propetyType.isAssignableFrom(Void.class)) { + fieldType = CLASS_POOL.get(propetyType.getName()); + } else { + fieldType = CLASS_POOL.get(String.class.getName()); + } + } catch (NotFoundException e) { + // 抛异常 + ClassClassPath path = new ClassClassPath(propetyType); + CLASS_POOL.insertClassPath(path); + try { + fieldType = CLASS_POOL.get(propetyType.getName()); + } catch (NotFoundException e1) { + log.error(e1.getMessage(), e1); + } + } + return fieldType; + } +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyModelPlugin.java b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyModelPlugin.java new file mode 100644 index 00000000..17bdd3e7 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyModelPlugin.java @@ -0,0 +1,61 @@ +package com.orangeforms.common.swagger.plugin; + +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.fasterxml.classmate.TypeResolver; +import com.google.common.base.CaseFormat; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import springfox.documentation.service.ResolvedMethodParameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.OperationModelsProviderPlugin; +import springfox.documentation.spi.service.contexts.RequestMappingContext; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 生成参数包装类的插件。 + * + * @author Jerry + * @date 2020-09-24 + */ +@Component +@Order(Ordered.HIGHEST_PRECEDENCE + 200) +@ConditionalOnProperty(prefix = "swagger", name = "enabled") +public class DynamicBodyModelPlugin implements OperationModelsProviderPlugin { + + private final TypeResolver typeResolver; + + public DynamicBodyModelPlugin(TypeResolver typeResolver) { + this.typeResolver = typeResolver; + } + + @Override + public void apply(RequestMappingContext context) { + List parameterTypes = context.getParameters(); + if (CollectionUtils.isEmpty(parameterTypes)) { + return; + } + List bodyParameter = parameterTypes.stream() + .filter(p -> p.hasParameterAnnotation(MyRequestBody.class)).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(bodyParameter)) { + return; + } + String groupName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, context.getGroupName()); + String clazzName = groupName + StringUtils.capitalize(context.getName()); + Class clazz = ByteBuddyUtil.createDynamicModelClass(clazzName, bodyParameter); + if (clazz != null) { + context.operationModelsBuilder().addInputParam(typeResolver.resolve(clazz)); + } + } + + @Override + public boolean supports(DocumentationType delimiter) { + // 支持2.0版本 + return delimiter == DocumentationType.SWAGGER_2; + } +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyParameterBuilder.java b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyParameterBuilder.java new file mode 100644 index 00000000..27b711f1 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyParameterBuilder.java @@ -0,0 +1,64 @@ +package com.orangeforms.common.swagger.plugin; + +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.google.common.base.CaseFormat; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.Parameter; +import springfox.documentation.service.ResolvedMethodParameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.OperationBuilderPlugin; +import springfox.documentation.spi.service.contexts.OperationContext; +import springfox.documentation.spi.service.contexts.ParameterContext; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 构建操作接口参数对象的插件。 + * + * @author Jerry + * @date 2020-09-24 + */ +@Component +@Order(Ordered.HIGHEST_PRECEDENCE + 102) +@ConditionalOnProperty(prefix = "swagger", name = "enabled") +public class DynamicBodyParameterBuilder implements OperationBuilderPlugin { + + @Override + public void apply(OperationContext context) { + List methodParameters = context.getParameters(); + List parameters = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(methodParameters)) { + List bodyParameter = methodParameters.stream() + .filter(p -> p.hasParameterAnnotation(MyRequestBody.class)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(bodyParameter)) { + // 构造model + String groupName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, context.getGroupName()); + String clazzName = groupName + StringUtils.capitalize(context.getName()); + ResolvedMethodParameter methodParameter = bodyParameter.get(0); + ParameterContext parameterContext = new ParameterContext(methodParameter, + new ParameterBuilder(), + context.getDocumentationContext(), + context.getGenericsNamingStrategy(), + context); + Parameter parameter = parameterContext.parameterBuilder() + .parameterType("body").modelRef(new ModelRef(clazzName)).name(clazzName).build(); + parameters.add(parameter); + } + } + context.operationBuilder().parameters(parameters); + } + + @Override + public boolean supports(DocumentationType delimiter) { + return delimiter == DocumentationType.SWAGGER_2; + } +} diff --git a/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..cc7814c5 --- /dev/null +++ b/orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.orangeforms.common.swagger.config.SwaggerAutoConfiguration \ No newline at end of file diff --git a/orange-demo-single/orange-demo-single-service/common/pom.xml b/orange-demo-single/orange-demo-single-service/common/pom.xml index 2e71f296..36da98a4 100644 --- a/orange-demo-single/orange-demo-single-service/common/pom.xml +++ b/orange-demo-single/orange-demo-single-service/common/pom.xml @@ -2,7 +2,7 @@ - com.orange.demo + com.orangeforms OrangeSingleDemo 1.0.0 @@ -17,5 +17,6 @@ common-datafilter common-redis common-sequence + common-swagger diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/pom.xml b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/pom.xml index 9abd221b..384b3743 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/pom.xml +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> framework - com.orange.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.orange.demo + com.orangeforms common-core 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportApiApp.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportApiApp.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportApiApp.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportApiApp.java index 01d010ce..16236cd5 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportApiApp.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportApiApp.java @@ -1,9 +1,9 @@ -package com.orange.demo.apidoc.tools; +package com.orangeforms.apidoc.tools; import com.alibaba.fastjson.JSON; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeConfig; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeParser; -import com.orange.demo.apidoc.tools.export.ApiPostmanExporter; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeConfig; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser; +import com.orangeforms.apidoc.tools.export.ApiPostmanExporter; import freemarker.template.TemplateException; import org.springframework.util.StreamUtils; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportDocApp.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportDocApp.java similarity index 83% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportDocApp.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportDocApp.java index 5d910267..06c9613a 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportDocApp.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportDocApp.java @@ -1,9 +1,9 @@ -package com.orange.demo.apidoc.tools; +package com.orangeforms.apidoc.tools; import com.alibaba.fastjson.JSON; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeConfig; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeParser; -import com.orange.demo.apidoc.tools.export.ApiDocExporter; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeConfig; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser; +import com.orangeforms.apidoc.tools.export.ApiDocExporter; import freemarker.template.TemplateException; import org.springframework.util.StreamUtils; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeConfig.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeConfig.java similarity index 97% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeConfig.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeConfig.java index 475bb5a5..8bebd4c3 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeConfig.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeConfig.java @@ -1,4 +1,4 @@ -package com.orange.demo.apidoc.tools.codeparser; +package com.orangeforms.apidoc.tools.codeparser; import lombok.Data; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeParser.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeParser.java similarity index 99% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeParser.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeParser.java index ee653cf2..bc0bd611 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeParser.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeParser.java @@ -1,10 +1,10 @@ -package com.orange.demo.apidoc.tools.codeparser; +package com.orangeforms.apidoc.tools.codeparser; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.orange.demo.common.core.object.Tuple2; -import com.orange.demo.apidoc.tools.exception.ApiCodeConfigParseException; +import com.orangeforms.common.core.object.Tuple2; +import com.orangeforms.apidoc.tools.exception.ApiCodeConfigParseException; import com.thoughtworks.qdox.JavaProjectBuilder; import com.thoughtworks.qdox.model.*; import com.thoughtworks.qdox.model.impl.DefaultJavaParameterizedType; @@ -63,7 +63,7 @@ public class ApiCodeParser { */ private ApiProject apiProject; /** - * 项目中所有的解析后Java文件，key是Java对象的全名，如：com.orange.demo.xxxx.Student。 + * 项目中所有的解析后Java文件，key是Java对象的全名，如：com.orangeforms.xxxx.Student。 */ private final Map projectJavaClassMap = new HashMap<>(128); /** diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/ApiCodeConfigParseException.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/ApiCodeConfigParseException.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/ApiCodeConfigParseException.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/ApiCodeConfigParseException.java index 9864e1b8..5ba9a1e5 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/ApiCodeConfigParseException.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/ApiCodeConfigParseException.java @@ -1,4 +1,4 @@ -package com.orange.demo.apidoc.tools.exception; +package com.orangeforms.apidoc.tools.exception; /** * 解析接口信息配置对象中的异常。 diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/MapperParseException.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/MapperParseException.java similarity index 89% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/MapperParseException.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/MapperParseException.java index 1f01bdc5..0d5b120b 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/MapperParseException.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/MapperParseException.java @@ -1,4 +1,4 @@ -package com.orange.demo.apidoc.tools.exception; +package com.orangeforms.apidoc.tools.exception; /** * 解析Mybatis XML Mapper中的异常。 diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiDocExporter.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiDocExporter.java similarity index 95% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiDocExporter.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiDocExporter.java index 68cca212..4f6383b1 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiDocExporter.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiDocExporter.java @@ -1,7 +1,7 @@ -package com.orange.demo.apidoc.tools.export; +package com.orangeforms.apidoc.tools.export; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeParser; -import com.orange.demo.apidoc.tools.util.FreeMarkerUtils; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser; +import com.orangeforms.apidoc.tools.util.FreeMarkerUtils; import freemarker.template.Configuration; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiPostmanExporter.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiPostmanExporter.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiPostmanExporter.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiPostmanExporter.java index ab63254d..d3e96961 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiPostmanExporter.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiPostmanExporter.java @@ -1,7 +1,7 @@ -package com.orange.demo.apidoc.tools.export; +package com.orangeforms.apidoc.tools.export; -import com.orange.demo.apidoc.tools.codeparser.ApiCodeParser; -import com.orange.demo.apidoc.tools.util.FreeMarkerUtils; +import com.orangeforms.apidoc.tools.codeparser.ApiCodeParser; +import com.orangeforms.apidoc.tools.util.FreeMarkerUtils; import freemarker.template.Configuration; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/util/FreeMarkerUtils.java b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/util/FreeMarkerUtils.java similarity index 92% rename from orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/util/FreeMarkerUtils.java rename to orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/util/FreeMarkerUtils.java index 9927c905..d7c490e1 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/util/FreeMarkerUtils.java +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/util/FreeMarkerUtils.java @@ -1,4 +1,4 @@ -package com.orange.demo.apidoc.tools.util; +package com.orangeforms.apidoc.tools.util; import java.util.UUID; diff --git a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/export-api-config.json b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/export-api-config.json index 66ac20b3..3cab1997 100644 --- a/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/export-api-config.json +++ b/orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/export-api-config.json @@ -1,6 +1,6 @@ { "projectName": "橙单单体开源版", - "basePackage": "com.orange.demo", + "basePackage": "com.orangeforms", "projectRootPath": "这里请使用当前工程的根目录，如：e:/xxx/OrangeDemo 或者 /Users/xxx/OrangeDemo", "microService": "false", "serviceList": [ @@ -11,11 +11,11 @@ "port": "8082", "controllerInfoList": [ { - "path": "/src/main/java/com/orange/demo/webadmin/app/controller", + "path": "/src/main/java/com/orangeforms/webadmin/app/controller", "groupName": "app" }, { - "path": "/src/main/java/com/orange/demo/webadmin/upms/controller", + "path": "/src/main/java/com/orangeforms/webadmin/upms/controller", "groupName": "upms" } ] diff --git a/orange-demo-single/orange-demo-single-service/framework/pom.xml b/orange-demo-single/orange-demo-single-service/framework/pom.xml index dc03dec2..713ab7aa 100644 --- a/orange-demo-single/orange-demo-single-service/framework/pom.xml +++ b/orange-demo-single/orange-demo-single-service/framework/pom.xml @@ -2,7 +2,7 @@ - com.orange.demo + com.orangeforms OrangeSingleDemo 1.0.0 diff --git a/orange-demo-single/orange-demo-single-service/pom.xml b/orange-demo-single/orange-demo-single-service/pom.xml index a3cc0842..a2e0c6cb 100644 --- a/orange-demo-single/orange-demo-single-service/pom.xml +++ b/orange-demo-single/orange-demo-single-service/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.orange.demo + com.orangeforms OrangeSingleDemo 1.0.0 OrangeSingleDemo @@ -37,6 +37,7 @@ 1.3.0 3.15.4 2.0.0 + 2.0.8 diff --git a/orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql b/orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql index 215a070d..36e97697 100644 --- a/orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql +++ b/orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql @@ -1,3 +1,18 @@ +/* + Navicat Premium Data Transfer + + Source Server : localhost + Source Server Type : MySQL + Source Server Version : 80027 + Source Host : localhost:3306 + Source Schema : zzdemo-single + + Target Server Type : MySQL + Target Server Version : 80027 + File Encoding : 65001 + + Date: 16/12/2021 20:38:39 +*/ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -7,10 +22,10 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `zz_area_code`; CREATE TABLE `zz_area_code` ( - `area_id` bigint(20) unsigned NOT NULL COMMENT '行政区划主键Id', - `area_name` varchar(128) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '行政区划名称', - `area_level` int(11) NOT NULL COMMENT '行政区划级别 (1: 省级别 2: 市级别 3: 区级别)', - `parent_id` bigint(20) DEFAULT NULL COMMENT '父级行政区划Id', + `area_id` bigint unsigned NOT NULL COMMENT '行政区划主键Id', + `area_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '行政区划名称', + `area_level` int NOT NULL COMMENT '行政区划级别 (1: 省级别 2: 市级别 3: 区级别)', + `parent_id` bigint DEFAULT NULL COMMENT '父级行政区划Id', PRIMARY KEY (`area_id`) USING BTREE, KEY `idx_level` (`area_level`) USING BTREE, KEY `idx_area_name` (`area_name`) USING BTREE, @@ -3684,15 +3699,15 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_class`; CREATE TABLE `zz_class` ( - `class_id` bigint(20) NOT NULL COMMENT '班级Id', - `class_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '班级名称', - `school_id` bigint(20) NOT NULL COMMENT '学校Id', - `leader_id` bigint(20) NOT NULL COMMENT '学生班长Id', - `finish_class_hour` int(11) NOT NULL DEFAULT '0' COMMENT '已完成课时数量', - `class_level` tinyint(4) NOT NULL COMMENT '班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)', - `create_user_id` bigint(20) NOT NULL COMMENT '创建用户', + `class_id` bigint NOT NULL COMMENT '班级Id', + `class_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '班级名称', + `school_id` bigint NOT NULL COMMENT '学校Id', + `leader_id` bigint NOT NULL COMMENT '学生班长Id', + `finish_class_hour` int NOT NULL DEFAULT '0' COMMENT '已完成课时数量', + `class_level` tinyint NOT NULL COMMENT '班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)', + `create_user_id` bigint NOT NULL COMMENT '创建用户', `create_time` datetime NOT NULL COMMENT '班级创建时间', - `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '班级状态(0: 正常 1: 解散)', + `status` tinyint NOT NULL DEFAULT '0' COMMENT '班级状态(0: 正常 1: 解散)', PRIMARY KEY (`class_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; @@ -3708,9 +3723,9 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_class_course`; CREATE TABLE `zz_class_course` ( - `class_id` bigint(20) NOT NULL COMMENT '班级Id', - `course_id` bigint(20) NOT NULL COMMENT '课程Id', - `course_order` tinyint(4) NOT NULL DEFAULT '0' COMMENT '课程顺序(数值越小越靠前)', + `class_id` bigint NOT NULL COMMENT '班级Id', + `course_id` bigint NOT NULL COMMENT '课程Id', + `course_order` tinyint NOT NULL DEFAULT '0' COMMENT '课程顺序(数值越小越靠前)', PRIMARY KEY (`class_id`,`course_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; @@ -3726,8 +3741,8 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_class_student`; CREATE TABLE `zz_class_student` ( - `class_id` bigint(20) NOT NULL COMMENT '班级Id', - `student_id` bigint(20) NOT NULL COMMENT '学生Id', + `class_id` bigint NOT NULL COMMENT '班级Id', + `student_id` bigint NOT NULL COMMENT '学生Id', PRIMARY KEY (`class_id`,`student_id`) USING BTREE, KEY `idx_student_id` (`student_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; @@ -3744,16 +3759,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_course`; CREATE TABLE `zz_course` ( - `course_id` bigint(20) NOT NULL COMMENT '主键Id', + `course_id` bigint NOT NULL COMMENT '主键Id', `course_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '课程名称', `price` decimal(10,2) NOT NULL COMMENT '课程价格', `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '课程描述', - `difficulty` int(11) NOT NULL COMMENT '课程难度(0: 容易 1: 普通 2: 很难)', - `grade_id` tinyint(4) NOT NULL COMMENT '年级Id', - `subject_id` tinyint(4) NOT NULL COMMENT '学科Id', - `class_hour` int(11) NOT NULL COMMENT '课时数量', + `difficulty` int NOT NULL COMMENT '课程难度(0: 容易 1: 普通 2: 很难)', + `grade_id` tinyint NOT NULL COMMENT '年级Id', + `subject_id` tinyint NOT NULL COMMENT '学科Id', + `class_hour` int NOT NULL COMMENT '课时数量', `picture_url` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '多张课程图片地址', - `create_user_id` bigint(20) NOT NULL COMMENT '创建用户Id', + `create_user_id` bigint NOT NULL COMMENT '创建用户Id', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '最后修改时间', PRIMARY KEY (`course_id`) USING BTREE @@ -3771,16 +3786,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_course_trans_stats`; CREATE TABLE `zz_course_trans_stats` ( - `stats_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键Id', + `stats_id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键Id', `stats_date` date NOT NULL COMMENT '统计日期', - `subject_id` tinyint(4) NOT NULL COMMENT '科目Id', - `grade_id` tinyint(4) NOT NULL COMMENT '年级Id', - `grade_name` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '年级名称', - `course_id` bigint(20) NOT NULL COMMENT '课程Id', - `course_name` varchar(128) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '课程名称', - `student_attend_count` int(11) NOT NULL COMMENT '学生上课次数', - `student_flower_amount` int(11) NOT NULL COMMENT '学生献花数量', - `student_flower_count` int(11) NOT NULL COMMENT '学生献花次数', + `subject_id` tinyint NOT NULL COMMENT '科目Id', + `grade_id` tinyint NOT NULL COMMENT '年级Id', + `grade_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '年级名称', + `course_id` bigint NOT NULL COMMENT '课程Id', + `course_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '课程名称', + `student_attend_count` int NOT NULL COMMENT '学生上课次数', + `student_flower_amount` int NOT NULL COMMENT '学生献花数量', + `student_flower_count` int NOT NULL COMMENT '学生献花次数', PRIMARY KEY (`stats_id`) USING BTREE, UNIQUE KEY `uk_stats_date_subject_id_grade_course_id` (`stats_date`,`grade_id`,`course_id`) USING BTREE, KEY `idx_grade_id` (`grade_id`) USING BTREE, @@ -3792,9 +3807,9 @@ CREATE TABLE `zz_course_trans_stats` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_grade`; CREATE TABLE `zz_grade` ( - `grade_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键Id', + `grade_id` int NOT NULL AUTO_INCREMENT COMMENT '主键Id', `grade_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '年级名称', - `status` int(11) NOT NULL COMMENT '是否正在使用（0：不是，1：是）', + `status` int NOT NULL COMMENT '是否正在使用（0：不是，1：是）', PRIMARY KEY (`grade_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; @@ -3803,9 +3818,9 @@ CREATE TABLE `zz_grade` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_material_edition`; CREATE TABLE `zz_material_edition` ( - `edition_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键Id', + `edition_id` int NOT NULL AUTO_INCREMENT COMMENT '主键Id', `edition_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '教材版本名称', - `status` int(11) NOT NULL COMMENT '是否正在使用（0：不是，1：是）', + `status` int NOT NULL COMMENT '是否正在使用（0：不是，1：是）', PRIMARY KEY (`edition_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; @@ -3814,19 +3829,19 @@ CREATE TABLE `zz_material_edition` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_student`; CREATE TABLE `zz_student` ( - `student_id` bigint(20) NOT NULL COMMENT '学生Id', - `login_mobile` varchar(20) COLLATE utf8mb4_bin NOT NULL COMMENT '登录手机', - `student_name` varchar(20) COLLATE utf8mb4_bin NOT NULL COMMENT '学生姓名', - `province_id` bigint(20) NOT NULL COMMENT '所在省份Id', - `city_id` bigint(20) NOT NULL COMMENT '所在城市Id', - `district_id` bigint(20) NOT NULL COMMENT '区县Id', - `gender` int(11) NOT NULL COMMENT '学生性别 (0: 女生 1: 男生)', + `student_id` bigint NOT NULL COMMENT '学生Id', + `login_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '登录手机', + `student_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '学生姓名', + `province_id` bigint NOT NULL COMMENT '所在省份Id', + `city_id` bigint NOT NULL COMMENT '所在城市Id', + `district_id` bigint NOT NULL COMMENT '区县Id', + `gender` int NOT NULL COMMENT '学生性别 (0: 女生 1: 男生)', `birthday` date NOT NULL COMMENT '生日', - `experience_level` tinyint(4) NOT NULL COMMENT '经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)', - `total_coin` int(11) NOT NULL DEFAULT '0' COMMENT '总共充值学币数量', - `left_coin` int(11) NOT NULL DEFAULT '0' COMMENT '可用学币数量', - `grade_id` int(11) NOT NULL COMMENT '年级Id', - `school_id` bigint(20) NOT NULL COMMENT '校区Id', + `experience_level` tinyint NOT NULL COMMENT '经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)', + `total_coin` int NOT NULL DEFAULT '0' COMMENT '总共充值学币数量', + `left_coin` int NOT NULL DEFAULT '0' COMMENT '可用学币数量', + `grade_id` int NOT NULL COMMENT '年级Id', + `school_id` bigint NOT NULL COMMENT '校区Id', `register_time` datetime NOT NULL COMMENT '注册时间', `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '学生状态 (0: 正常 1: 锁定 2: 注销)', PRIMARY KEY (`student_id`) USING BTREE, @@ -3845,27 +3860,27 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_student_action_stats`; CREATE TABLE `zz_student_action_stats` ( - `stats_id` bigint(20) NOT NULL COMMENT '主键Id', + `stats_id` bigint NOT NULL COMMENT '主键Id', `stats_date` date NOT NULL COMMENT '统计日期', `stats_month` date DEFAULT NULL COMMENT '统计小时', - `grade_id` int(11) NOT NULL COMMENT '年级Id', - `province_id` bigint(20) NOT NULL COMMENT '学生所在省Id', - `city_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '学生所在城市Id', - `buy_course_amount` int(11) NOT NULL DEFAULT '0' COMMENT '购课学币数量', - `buy_course_count` int(11) NOT NULL DEFAULT '0' COMMENT '购买课程次数', - `buy_video_amount` int(11) NOT NULL DEFAULT '0' COMMENT '购买视频学币数量', - `buy_video_count` int(11) NOT NULL DEFAULT '0' COMMENT '购买视频次数', - `buy_paper_amount` int(11) NOT NULL DEFAULT '0' COMMENT '购买作业学币数量', - `buy_paper_count` int(11) NOT NULL DEFAULT '0' COMMENT '购买作业次数', - `buy_flower_amount` int(11) NOT NULL DEFAULT '0' COMMENT '购买献花数量', - `buy_flower_count` int(11) NOT NULL DEFAULT '0' COMMENT '购买献花次数', - `recharge_coin_amount` int(11) NOT NULL DEFAULT '0' COMMENT '充值学币数量', - `recharge_coin_count` int(11) NOT NULL DEFAULT '0' COMMENT '充值学币次数', - `do_course_count` int(11) NOT NULL COMMENT '线下课程上课次数', - `watch_video_count` int(11) NOT NULL DEFAULT '0' COMMENT '观看视频次数', - `watch_video_total_second` int(11) NOT NULL COMMENT '购买献花消费学币数量', - `do_exercise_count` int(11) NOT NULL DEFAULT '0' COMMENT '做题数量', - `do_exercise_correct_count` int(11) NOT NULL DEFAULT '0' COMMENT '做题正确的数量', + `grade_id` int NOT NULL COMMENT '年级Id', + `province_id` bigint NOT NULL COMMENT '学生所在省Id', + `city_id` bigint NOT NULL DEFAULT '0' COMMENT '学生所在城市Id', + `buy_course_amount` int NOT NULL DEFAULT '0' COMMENT '购课学币数量', + `buy_course_count` int NOT NULL DEFAULT '0' COMMENT '购买课程次数', + `buy_video_amount` int NOT NULL DEFAULT '0' COMMENT '购买视频学币数量', + `buy_video_count` int NOT NULL DEFAULT '0' COMMENT '购买视频次数', + `buy_paper_amount` int NOT NULL DEFAULT '0' COMMENT '购买作业学币数量', + `buy_paper_count` int NOT NULL DEFAULT '0' COMMENT '购买作业次数', + `buy_flower_amount` int NOT NULL DEFAULT '0' COMMENT '购买献花数量', + `buy_flower_count` int NOT NULL DEFAULT '0' COMMENT '购买献花次数', + `recharge_coin_amount` int NOT NULL DEFAULT '0' COMMENT '充值学币数量', + `recharge_coin_count` int NOT NULL DEFAULT '0' COMMENT '充值学币次数', + `do_course_count` int NOT NULL COMMENT '线下课程上课次数', + `watch_video_count` int NOT NULL DEFAULT '0' COMMENT '观看视频次数', + `watch_video_total_second` int NOT NULL COMMENT '购买献花消费学币数量', + `do_exercise_count` int NOT NULL DEFAULT '0' COMMENT '做题数量', + `do_exercise_correct_count` int NOT NULL DEFAULT '0' COMMENT '做题正确的数量', PRIMARY KEY (`stats_id`) USING BTREE, UNIQUE KEY `uk_stats_date_grade_id_region_id` (`stats_date`,`grade_id`,`province_id`,`city_id`) USING BTREE, KEY `idx_province_id` (`province_id`) USING BTREE, @@ -3879,20 +3894,20 @@ CREATE TABLE `zz_student_action_stats` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_student_action_trans`; CREATE TABLE `zz_student_action_trans` ( - `trans_id` bigint(20) NOT NULL COMMENT '主键Id', - `student_id` bigint(20) NOT NULL COMMENT '学生Id', - `student_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '学生名称', - `school_id` bigint(20) NOT NULL COMMENT '学生校区', - `grade_id` int(11) NOT NULL COMMENT '年级Id', - `action_type` tinyint(4) NOT NULL COMMENT '行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)', - `device_type` tinyint(4) NOT NULL COMMENT '设备类型(0: iOS 1: Android 2: PC)', - `watch_video_seconds` int(11) DEFAULT NULL COMMENT '看视频秒数', - `flower_count` int(11) DEFAULT NULL COMMENT '购买献花数量', - `paper_count` int(11) DEFAULT NULL COMMENT '购买作业数量', - `video_count` int(11) DEFAULT NULL COMMENT '购买视频数量', - `course_count` int(11) DEFAULT NULL COMMENT '购买课程数量', - `coin_count` int(11) DEFAULT NULL COMMENT '充值学币数量', - `exercise_correct_flag` tinyint(4) DEFAULT NULL COMMENT '做题是否正确标记', + `trans_id` bigint NOT NULL COMMENT '主键Id', + `student_id` bigint NOT NULL COMMENT '学生Id', + `student_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '学生名称', + `school_id` bigint NOT NULL COMMENT '学生校区', + `grade_id` int NOT NULL COMMENT '年级Id', + `action_type` tinyint NOT NULL COMMENT '行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)', + `device_type` tinyint NOT NULL COMMENT '设备类型(0: iOS 1: Android 2: PC)', + `watch_video_seconds` int DEFAULT NULL COMMENT '看视频秒数', + `flower_count` int DEFAULT NULL COMMENT '购买献花数量', + `paper_count` int DEFAULT NULL COMMENT '购买作业数量', + `video_count` int DEFAULT NULL COMMENT '购买视频数量', + `course_count` int DEFAULT NULL COMMENT '购买课程数量', + `coin_count` int DEFAULT NULL COMMENT '充值学币数量', + `exercise_correct_flag` tinyint DEFAULT NULL COMMENT '做题是否正确标记', `create_time` datetime NOT NULL COMMENT '发生时间', PRIMARY KEY (`trans_id`) USING BTREE, KEY `idx_student_id` (`student_id`) USING BTREE, @@ -3907,14 +3922,14 @@ CREATE TABLE `zz_student_action_trans` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_data_perm`; CREATE TABLE `zz_sys_data_perm` ( - `data_perm_id` bigint(20) NOT NULL COMMENT '主键', - `data_perm_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '显示名称', - `rule_type` tinyint(2) NOT NULL COMMENT '数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `data_perm_id` bigint NOT NULL COMMENT '主键', + `data_perm_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '显示名称', + `rule_type` tinyint NOT NULL COMMENT '数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`data_perm_id`) USING BTREE, KEY `idx_create_time` (`create_time`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='数据权限表'; @@ -3924,8 +3939,8 @@ CREATE TABLE `zz_sys_data_perm` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_data_perm_dept`; CREATE TABLE `zz_sys_data_perm_dept` ( - `data_perm_id` bigint(20) NOT NULL COMMENT '数据权限Id', - `dept_id` bigint(20) NOT NULL COMMENT '部门Id', + `data_perm_id` bigint NOT NULL COMMENT '数据权限Id', + `dept_id` bigint NOT NULL COMMENT '部门Id', PRIMARY KEY (`data_perm_id`,`dept_id`), KEY `idx_dept_id` (`dept_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='数据权限和部门关联表'; @@ -3935,8 +3950,8 @@ CREATE TABLE `zz_sys_data_perm_dept` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_data_perm_user`; CREATE TABLE `zz_sys_data_perm_user` ( - `data_perm_id` bigint(20) NOT NULL COMMENT '数据权限Id', - `user_id` bigint(20) NOT NULL COMMENT '用户Id', + `data_perm_id` bigint NOT NULL COMMENT '数据权限Id', + `user_id` bigint NOT NULL COMMENT '用户Id', PRIMARY KEY (`data_perm_id`,`user_id`), KEY `idx_user_id` (`user_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='数据权限和用户关联表'; @@ -3946,15 +3961,15 @@ CREATE TABLE `zz_sys_data_perm_user` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_dept`; CREATE TABLE `zz_sys_dept` ( - `dept_id` bigint(20) NOT NULL COMMENT '部门Id', - `parent_id` bigint(20) DEFAULT NULL COMMENT '父部门Id', - `dept_name` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT '部门名称', - `show_order` int(11) NOT NULL COMMENT '兄弟部分之间的显示顺序，数字越小越靠前', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `dept_id` bigint NOT NULL COMMENT '部门Id', + `parent_id` bigint DEFAULT NULL COMMENT '父部门Id', + `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '部门名称', + `show_order` int NOT NULL COMMENT '兄弟部分之间的显示顺序，数字越小越靠前', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(1) NOT NULL DEFAULT '0' COMMENT '删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL DEFAULT '0' COMMENT '删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`dept_id`) USING BTREE, KEY `idx_parent_id` (`parent_id`) USING BTREE, KEY `idx_show_order` (`show_order`) USING BTREE @@ -3973,8 +3988,8 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_dept_relation`; CREATE TABLE `zz_sys_dept_relation` ( - `parent_dept_id` bigint(20) NOT NULL COMMENT '父部门Id', - `dept_id` bigint(20) NOT NULL COMMENT '部门Id', + `parent_dept_id` bigint NOT NULL COMMENT '父部门Id', + `dept_id` bigint NOT NULL COMMENT '部门Id', PRIMARY KEY (`parent_dept_id`,`dept_id`), KEY `idx_dept_id` (`dept_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT COMMENT='部门关联关系表'; @@ -3992,20 +4007,20 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_menu`; CREATE TABLE `zz_sys_menu` ( - `menu_id` bigint(20) NOT NULL COMMENT '主键Id', - `parent_id` bigint(20) DEFAULT NULL COMMENT '父菜单Id，目录菜单的父菜单为null', - `menu_name` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT '菜单显示名称', - `menu_type` int(11) NOT NULL COMMENT '(0: 目录 1: 菜单 2: 按钮 3: UI片段)', - `form_router_name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '前端表单路由名称，仅用于menu_type为1的菜单类型', - `online_form_id` bigint(20) DEFAULT NULL COMMENT '在线表单主键Id', - `online_menu_perm_type` int(11) DEFAULT NULL COMMENT '在线表单菜单的权限控制类型', - `show_order` int(11) NOT NULL COMMENT '菜单显示顺序 (值越小，排序越靠前)', - `icon` varchar(50) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '菜单图标', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `menu_id` bigint NOT NULL COMMENT '主键Id', + `parent_id` bigint DEFAULT NULL COMMENT '父菜单Id，目录菜单的父菜单为null', + `menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '菜单显示名称', + `menu_type` int NOT NULL COMMENT '(0: 目录 1: 菜单 2: 按钮 3: UI片段)', + `form_router_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '前端表单路由名称，仅用于menu_type为1的菜单类型', + `online_form_id` bigint DEFAULT NULL COMMENT '在线表单主键Id', + `online_menu_perm_type` int DEFAULT NULL COMMENT '在线表单菜单的权限控制类型', + `show_order` int NOT NULL COMMENT '菜单显示顺序 (值越小，排序越靠前)', + `icon` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '菜单图标', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`menu_id`) USING BTREE, KEY `idx_show_order` (`show_order`) USING BTREE, KEY `idx_parent_id` (`parent_id`) USING BTREE @@ -4024,7 +4039,7 @@ INSERT INTO `zz_sys_menu` VALUES (1309065501183315972, 1309065501179121664, '权 INSERT INTO `zz_sys_menu` VALUES (1309065501183315973, 1309065501179121664, '字典管理', 1, 'formSysDict', NULL, NULL, 135, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); INSERT INTO `zz_sys_menu` VALUES (1309149272268083200, NULL, '业务管理', 0, NULL, NULL, NULL, 10, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); INSERT INTO `zz_sys_menu` VALUES (1309149323312762880, NULL, '统计管理', 0, NULL, NULL, NULL, 20, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); -INSERT INTO `zz_sys_menu` VALUES (1309149401033216000, 1309149272268083200, '校区管理', 1, NULL, NULL, NULL, 1, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); +INSERT INTO `zz_sys_menu` VALUES (1309149401033216000, 1309149272268083200, '校区管理', 1, NULL, NULL, NULL, 1, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', -1); INSERT INTO `zz_sys_menu` VALUES (1309149467043172352, 1309149272268083200, '学生管理', 1, 'formStudent', NULL, NULL, 5, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); INSERT INTO `zz_sys_menu` VALUES (1309149536341463040, 1309149272268083200, '课程管理', 1, 'formCourse', NULL, NULL, 10, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); INSERT INTO `zz_sys_menu` VALUES (1309149599981637632, 1309149272268083200, '班级管理', 1, 'formClass', NULL, NULL, 15, NULL, 1450785767004573869, '2021-10-20 00:00:00', 1450785767004573869, '2021-10-20 00:00:00', 1); @@ -4122,8 +4137,8 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_menu_perm_code`; CREATE TABLE `zz_sys_menu_perm_code` ( - `menu_id` bigint(20) NOT NULL COMMENT '关联菜单Id', - `perm_code_id` bigint(20) NOT NULL COMMENT '关联权限字Id', + `menu_id` bigint NOT NULL COMMENT '关联菜单Id', + `perm_code_id` bigint NOT NULL COMMENT '关联权限字Id', PRIMARY KEY (`menu_id`,`perm_code_id`) USING BTREE, KEY `idx_perm_code_id` (`perm_code_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='菜单和权限关系表'; @@ -4267,25 +4282,25 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_operation_log`; CREATE TABLE `zz_sys_operation_log` ( - `log_id` bigint(20) NOT NULL COMMENT '主键Id', - `description` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '日志描述', - `operation_type` int(11) DEFAULT NULL COMMENT '操作类型', - `service_name` varchar(128) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '接口所在服务名称', - `api_class` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '调用的controller全类名', - `api_method` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '调用的controller中的方法', - `session_id` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户会话sessionId', - `trace_id` char(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '每次请求的Id', - `elapse` int(11) DEFAULT NULL COMMENT '调用时长', - `request_method` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'HTTP 请求方法，如GET', - `request_url` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'HTTP 请求地址', - `request_arguments` varchar(2000) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'controller接口参数', - `response_result` varchar(2000) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'controller应答结果', - `request_ip` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '请求IP', + `log_id` bigint NOT NULL COMMENT '主键Id', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '日志描述', + `operation_type` int DEFAULT NULL COMMENT '操作类型', + `service_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '接口所在服务名称', + `api_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '调用的controller全类名', + `api_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '调用的controller中的方法', + `session_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户会话sessionId', + `trace_id` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '每次请求的Id', + `elapse` int DEFAULT NULL COMMENT '调用时长', + `request_method` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'HTTP 请求方法，如GET', + `request_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'HTTP 请求地址', + `request_arguments` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'controller接口参数', + `response_result` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'controller应答结果', + `request_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '请求IP', `success` bit(1) DEFAULT NULL COMMENT '应答状态', - `error_msg` varchar(2000) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '错误信息', - `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户Id', - `operator_id` bigint(20) DEFAULT NULL COMMENT '操作员Id', - `operator_name` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '操作员名称', + `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '错误信息', + `tenant_id` bigint DEFAULT NULL COMMENT '租户Id', + `operator_id` bigint DEFAULT NULL COMMENT '操作员Id', + `operator_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '操作员名称', `operation_time` datetime DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`log_id`), KEY `idx_trace_id_idx` (`trace_id`), @@ -4313,6 +4328,15 @@ INSERT INTO `zz_sys_operation_log` VALUES (1450789722765922304, '', 15, 'applica INSERT INTO `zz_sys_operation_log` VALUES (1450789822024126464, '', 10, 'application-webadmin', 'com.orange.demo.webadmin.app.controller.StudentClassController', 'com.orange.demo.webadmin.app.controller.StudentClassController.add', 'admin_4_151b92125fcd41cfb3f4ad8b72bf2ee3', '44e4c4db84714d619f5c2713582d1ee5', 27, 'POST', '/admin/app/studentClass/add', '{\"studentClassDto\":{\"classLevel\":0,\"className\":\"一年级数学班\",\"finishClassHour\":12,\"leaderId\":1450789566859448320,\"schoolId\":1450789433778376704}}', '{\"data\":1450789822061875200,\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '192.168.43.231', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-10-20 19:43:43'); INSERT INTO `zz_sys_operation_log` VALUES (1450789887031644160, '', 25, 'application-webadmin', 'com.orange.demo.webadmin.app.controller.StudentClassController', 'com.orange.demo.webadmin.app.controller.StudentClassController.addClassCourse', 'admin_4_151b92125fcd41cfb3f4ad8b72bf2ee3', 'd135e67d18f4477e93256e4ceb898402', 24, 'POST', '/admin/app/studentClass/addClassCourse', '{\"classId\":1450789822061875200,\"classCourseDtoList\":[{\"courseId\":1450789702675206144}]}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '192.168.43.231', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-10-20 19:43:58'); INSERT INTO `zz_sys_operation_log` VALUES (1450789917452931072, '', 25, 'application-webadmin', 'com.orange.demo.webadmin.app.controller.StudentClassController', 'com.orange.demo.webadmin.app.controller.StudentClassController.addClassStudent', 'admin_4_151b92125fcd41cfb3f4ad8b72bf2ee3', 'e4cc517c729549ef8315e334541b7826', 26, 'POST', '/admin/app/studentClass/addClassStudent', '{\"classId\":1450789822061875200,\"classStudentDtoList\":[{\"studentId\":1450789566859448320}]}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '192.168.43.231', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-10-20 19:44:05'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459234364264448, '', 0, 'application-webadmin', 'com.orangeforms.webadmin.upms.controller.LoginController', 'com.orangeforms.webadmin.upms.controller.LoginController.doLogin', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', 'a151cc5b92b34fb290c153bf6c8f6a1c', 331, 'POST', '/admin/upms/login/doLogin', '{\"password\":\"YPd4CgC5Uxt%2BIXzsif6XSJtPqOyyZOEAU%2BHQdwhbGwcABQs9L6YIe7JWBlC03376ZcWFQNpb8ajVaomeRJBnr1urQ0rUb%2FHrDhWJo8ItfL6ndfYAK5McoP7GRGEHcV4BT8FzbtnZ0mtXNjwGfvZ2PJTVLVuxfgN66o%2BYjJDHQ4k%3D\",\"loginName\":\"admin\"}', NULL, '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:36:35'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459273119633408, '', 55, 'application-webadmin', 'com.orangeforms.webadmin.app.controller.CourseController', 'com.orangeforms.webadmin.app.controller.CourseController.download', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', 'fd1da7db65fd45d68e2dab67c7aae797', 8, 'GET', '/admin/app/course/download', '{\"fieldName\":\"pictureUrl\",\"filename\":\"46296fa64fa94bc2a1dacde9bfd146cb.png\",\"asImage\":true,\"courseId\":1450789702675206144}', NULL, '172.20.10.2', b'0', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:36:44'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459354610765824, '', 55, 'application-webadmin', 'com.orangeforms.webadmin.app.controller.CourseController', 'com.orangeforms.webadmin.app.controller.CourseController.download', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', '619cefb215a94ced85fabd106c4c69b7', 4, 'GET', '/admin/app/course/download', '{\"fieldName\":\"pictureUrl\",\"filename\":\"46296fa64fa94bc2a1dacde9bfd146cb.png\",\"asImage\":true,\"courseId\":1450789702675206144}', NULL, '172.20.10.2', b'0', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:03'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459412014010368, '', 30, 'application-webadmin', 'com.orangeforms.webadmin.app.controller.StudentClassController', 'com.orangeforms.webadmin.app.controller.StudentClassController.deleteClassCourse', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', '8086f8c1bf1644ad8ce6c89b33c5eed6', 8, 'POST', '/admin/app/studentClass/deleteClassCourse', '{\"classId\":1450789822061875200,\"courseId\":1450789702675206144}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:17'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459428325658624, '', 25, 'application-webadmin', 'com.orangeforms.webadmin.app.controller.StudentClassController', 'com.orangeforms.webadmin.app.controller.StudentClassController.addClassCourse', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', 'b887cc2abfb04727835e9f6276e8c2f2', 123, 'POST', '/admin/app/studentClass/addClassCourse', '{\"classId\":1450789822061875200,\"classCourseDtoList\":[{\"courseId\":1450789702675206144}]}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:21'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459515063865344, '', 20, 'application-webadmin', 'com.orangeforms.webadmin.upms.controller.SysMenuController', 'com.orangeforms.webadmin.upms.controller.SysMenuController.delete', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', '1bf64a5555d846be8c1f18ed48f856be', 20, 'POST', '/admin/upms/sysMenu/delete', '{\"menuId\":1309149401033216000}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:41'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459548987396096, '', 5, 'application-webadmin', 'com.orangeforms.webadmin.upms.controller.LoginController', 'com.orangeforms.webadmin.upms.controller.LoginController.doLogout', 'admin_4_9b0b9560cf7a4a20b7e9d2a1b414cd6e', '5c12593d2ca649bba522672c72ef9d39', 6, 'POST', '/admin/upms/login/doLogout', '{}', '{\"errorCode\":\"NO-ERROR\",\"errorMessage\":\"NO-MESSAGE\",\"success\":true}', '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:50'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459554620346368, '', 0, 'application-webadmin', 'com.orangeforms.webadmin.upms.controller.LoginController', 'com.orangeforms.webadmin.upms.controller.LoginController.doLogin', 'admin_4_383de725f9704612a412f84bed63de91', 'cd7cf3ce2d3043c1b220154384212caf', 119, 'POST', '/admin/upms/login/doLogin', '{\"password\":\"Mt6pLOhnZNJRtnjXl2YWhnclqTWNp2Tqh1U0wInyCHXP4FsD4bhgTJZ0Ou7m%2BTpSJB0dapf1Gs%2FFeq4KXOJuLuPH4vC5wI%2FnhUpxKXmzH5aN7CniT%2FV9DmHCo0pL%2Foc8mtkcC4aX21YsAwa8R70CzetFfaq83srwdEM8SlVjpt0%3D\",\"loginName\":\"admin\"}', NULL, '172.20.10.2', b'1', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:51'); +INSERT INTO `zz_sys_operation_log` VALUES (1471459571519197184, '', 55, 'application-webadmin', 'com.orangeforms.webadmin.app.controller.CourseController', 'com.orangeforms.webadmin.app.controller.CourseController.download', 'admin_4_383de725f9704612a412f84bed63de91', '830eb70c62d3417a8b2e2163ad947600', 4, 'GET', '/admin/app/course/download', '{\"fieldName\":\"pictureUrl\",\"filename\":\"46296fa64fa94bc2a1dacde9bfd146cb.png\",\"asImage\":true,\"courseId\":1450789702675206144}', NULL, '172.20.10.2', b'0', NULL, NULL, 1450785767004573869, 'admin', '2021-12-16 20:37:55'); COMMIT; -- ---------------------------- @@ -4320,16 +4344,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_perm`; CREATE TABLE `zz_sys_perm` ( - `perm_id` bigint(20) NOT NULL COMMENT '权限id', - `module_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '权限所在的权限模块id', - `perm_name` varchar(64) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '权限名称', - `url` varchar(128) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '关联的url', - `show_order` int(11) NOT NULL DEFAULT '0' COMMENT '权限在当前模块下的顺序，由小到大', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `perm_id` bigint NOT NULL COMMENT '权限id', + `module_id` bigint NOT NULL DEFAULT '0' COMMENT '权限所在的权限模块id', + `perm_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '权限名称', + `url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '关联的url', + `show_order` int NOT NULL DEFAULT '0' COMMENT '权限在当前模块下的顺序，由小到大', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`perm_id`) USING BTREE, KEY `idx_show_order` (`show_order`) USING BTREE, KEY `idx_module_id` (`module_id`) USING BTREE @@ -4472,17 +4496,17 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_perm_code`; CREATE TABLE `zz_sys_perm_code` ( - `perm_code_id` bigint(20) NOT NULL COMMENT '主键Id', - `parent_id` bigint(20) DEFAULT NULL COMMENT '上级权限字Id', + `perm_code_id` bigint NOT NULL COMMENT '主键Id', + `parent_id` bigint DEFAULT NULL COMMENT '上级权限字Id', `perm_code` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '权限字标识(一般为有含义的英文字符串)', - `perm_code_type` int(11) NOT NULL COMMENT '类型(0: 表单 1: UI片段 2: 操作)', + `perm_code_type` int NOT NULL COMMENT '类型(0: 表单 1: UI片段 2: 操作)', `show_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '显示名称', - `show_order` int(11) NOT NULL COMMENT '显示顺序(数值越小，越靠前)', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `show_order` int NOT NULL COMMENT '显示顺序(数值越小，越靠前)', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`perm_code_id`), UNIQUE KEY `idx_perm_code` (`perm_code`) USING BTREE, KEY `idx_parent_id` (`parent_id`) USING BTREE, @@ -4628,8 +4652,8 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_perm_code_perm`; CREATE TABLE `zz_sys_perm_code_perm` ( - `perm_code_id` bigint(20) NOT NULL COMMENT '权限字Id', - `perm_id` bigint(20) NOT NULL COMMENT '权限id', + `perm_code_id` bigint NOT NULL COMMENT '权限字Id', + `perm_id` bigint NOT NULL COMMENT '权限id', PRIMARY KEY (`perm_code_id`,`perm_id`), KEY `idx_perm_id` (`perm_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT COMMENT='系统权限字和权限资源关联表'; @@ -4767,16 +4791,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_perm_module`; CREATE TABLE `zz_sys_perm_module` ( - `module_id` bigint(20) NOT NULL COMMENT '权限模块id', - `parent_id` bigint(20) DEFAULT '0' COMMENT '上级权限模块id', - `module_name` varchar(64) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '权限模块名称', - `module_type` int(11) NOT NULL COMMENT '模块类型(0: 普通模块 1: Controller模块)', - `show_order` int(11) NOT NULL DEFAULT '0' COMMENT '权限模块在当前层级下的顺序，由小到大', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `module_id` bigint NOT NULL COMMENT '权限模块id', + `parent_id` bigint DEFAULT '0' COMMENT '上级权限模块id', + `module_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '权限模块名称', + `module_type` int NOT NULL COMMENT '模块类型(0: 普通模块 1: Controller模块)', + `show_order` int NOT NULL DEFAULT '0' COMMENT '权限模块在当前层级下的顺序，由小到大', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`module_id`) USING BTREE, KEY `idx_show_order` (`show_order`) USING BTREE, KEY `idx_parent_id` (`parent_id`) USING BTREE, @@ -4849,13 +4873,13 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_role`; CREATE TABLE `zz_sys_role` ( - `role_id` bigint(20) NOT NULL COMMENT '主键Id', - `role_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '角色名称', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `role_id` bigint NOT NULL COMMENT '主键Id', + `role_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '角色名称', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '逻辑删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT COMMENT='系统角色表'; @@ -4864,8 +4888,8 @@ CREATE TABLE `zz_sys_role` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_role_menu`; CREATE TABLE `zz_sys_role_menu` ( - `role_id` bigint(20) NOT NULL COMMENT '角色Id', - `menu_id` bigint(20) NOT NULL COMMENT '菜单Id', + `role_id` bigint NOT NULL COMMENT '角色Id', + `menu_id` bigint NOT NULL COMMENT '菜单Id', PRIMARY KEY (`role_id`,`menu_id`) USING BTREE, KEY `idx_menu_id` (`menu_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT COMMENT='角色与菜单对应关系表'; @@ -4875,19 +4899,19 @@ CREATE TABLE `zz_sys_role_menu` ( -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_user`; CREATE TABLE `zz_sys_user` ( - `user_id` bigint(20) NOT NULL COMMENT '主键Id', - `login_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '用户登录名称', - `password` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '密码', - `show_name` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '用户显示名称', - `dept_id` bigint(20) NOT NULL COMMENT '用户所在部门Id', - `user_type` int(11) NOT NULL COMMENT '用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)', - `head_image_url` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户头像的Url', - `user_status` int(11) NOT NULL COMMENT '状态(0: 正常 1: 锁定)', - `create_user_id` bigint(20) NOT NULL COMMENT '创建者Id', + `user_id` bigint NOT NULL COMMENT '主键Id', + `login_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '用户登录名称', + `password` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '密码', + `show_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '用户显示名称', + `dept_id` bigint NOT NULL COMMENT '用户所在部门Id', + `user_type` int NOT NULL COMMENT '用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)', + `head_image_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户头像的Url', + `user_status` int NOT NULL COMMENT '状态(0: 正常 1: 锁定)', + `create_user_id` bigint NOT NULL COMMENT '创建者Id', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user_id` bigint(20) NOT NULL COMMENT '更新者Id', + `update_user_id` bigint NOT NULL COMMENT '更新者Id', `update_time` datetime NOT NULL COMMENT '最后更新时间', - `deleted_flag` int(11) NOT NULL COMMENT '删除标记(1: 正常 -1: 已删除)', + `deleted_flag` int NOT NULL COMMENT '删除标记(1: 正常 -1: 已删除)', PRIMARY KEY (`user_id`) USING BTREE, UNIQUE KEY `uk_login_name` (`login_name`) USING BTREE, KEY `idx_dept_id` (`dept_id`) USING BTREE, @@ -4906,8 +4930,8 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `zz_sys_user_role`; CREATE TABLE `zz_sys_user_role` ( - `user_id` bigint(20) NOT NULL COMMENT '用户Id', - `role_id` bigint(20) NOT NULL COMMENT '角色Id', + `user_id` bigint NOT NULL COMMENT '用户Id', + `role_id` bigint NOT NULL COMMENT '角色Id', PRIMARY KEY (`user_id`,`role_id`) USING BTREE, KEY `idx_role_id` (`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=COMPACT COMMENT='用户与角色对应关系表'; diff --git a/orange-demo-single/orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/46296fa64fa94bc2a1dacde9bfd146cb.png b/orange-demo-single/orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/46296fa64fa94bc2a1dacde9bfd146cb.png deleted file mode 100644 index f2df5bb8..00000000 Binary files a/orange-demo-single/orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/46296fa64fa94bc2a1dacde9bfd146cb.png and /dev/null differ diff --git a/orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js b/orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js index 862efc22..75e814ab 100644 --- a/orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js +++ b/orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js @@ -1,6 +1,17 @@ import * as staticDict from '@/staticDict' export default class DictionaryController { + static dictSysRole (sender, params, axiosOption, httpOption) { + return new Promise((resolve, reject) => { + sender.doUrl('/admin/upms/sysRole/listDict', 'get', params, axiosOption, httpOption).then(res => { + let dictData = new staticDict.DictionaryBase('角色字典'); + dictData.setList(res.data); + resolve(dictData); + }).catch(err => { + reject(err); + }); + }); + } static dictSysUserStatus () { return new Promise((resolve) => { resolve(staticDict.SysUserStatus); diff --git a/orange-demo-single/orange-demo-single-web/src/core/http/index.js b/orange-demo-single/orange-demo-single-web/src/core/http/index.js index 8e17cff6..3dba6663 100644 --- a/orange-demo-single/orange-demo-single-web/src/core/http/index.js +++ b/orange-demo-single/orange-demo-single-web/src/core/http/index.js @@ -2,7 +2,6 @@ import Vue from 'vue'; import { Loading, Message } from 'element-ui'; import request from './request'; import requestUrl from './requestUrl'; -import merge from 'lodash/merge'; import { globalConfig } from '@/core/config'; /** @@ -132,34 +131,41 @@ const ajaxThrottleSet = new Set(); * @param {Object} options 显示设置 */ const doUrl = function (url, type, params, axiosOption, options) { - options = merge(globalConfig.httpOption, options); - axiosOption = merge(globalConfig.axiosOption, axiosOption); + let finalOption = { + ...globalConfig.httpOption, + ...options + }; + let { showMask, showError, throttleFlag, throttleTimeout } = finalOption; + let finalAxiosOption = { + ...globalConfig.axiosOption, + ...axiosOption + } if (type == null || type === '') type = 'post'; - if (ajaxThrottleSet.has(url) && options.throttleFlag) { + if (ajaxThrottleSet.has(url) && throttleFlag) { return Promise.resolve(); } else { - if (options.throttleFlag) { + if (throttleFlag) { ajaxThrottleSet.add(url); setTimeout(() => { ajaxThrottleSet.delete(url); - }, options.throttleTimeout || 50); + }, throttleTimeout || 50); } return new Promise((resolve, reject) => { - if (options.showMask) loadingManager.showMask(); + if (showMask) loadingManager.showMask(); let ajaxCall = null; if (type.toLowerCase() === 'get') { - ajaxCall = fetchGet(url, params, axiosOption); + ajaxCall = fetchGet(url, params, finalAxiosOption); } else if (type.toLowerCase() === 'post') { - ajaxCall = fetchPost(url, params, axiosOption); + ajaxCall = fetchPost(url, params, finalAxiosOption); } if (ajaxCall != null) { ajaxCall.then(res => { - if (options.showMask) loadingManager.hideMask(); + if (showMask) loadingManager.hideMask(); if (res.data && res.data.success) { resolve(res.data); } else { - if (options.showError) { + if (showError) { Message.error({ showClose: true, message: res.data.errorMessage ? res.data.errorMessage : '数据请求失败' @@ -168,8 +174,8 @@ const doUrl = function (url, type, params, axiosOption, options) { reject(res.data); } }).catch(e => { - if (options.showMask) loadingManager.hideMask(); - if (options.showError) { + if (showMask) loadingManager.hideMask(); + if (showError) { Message.error({ showClose: true, message: e.errorMessage ? e.errorMessage : '网络请求错误' @@ -178,7 +184,7 @@ const doUrl = function (url, type, params, axiosOption, options) { reject(e); }); } else { - if (options.showMask) loadingManager.hideMask(); + if (showMask) loadingManager.hideMask(); reject(new Error('错误的请求类型 - ' + type)); } }); diff --git a/orange-demo-single/orange-demo-single-web/src/store/actions.js b/orange-demo-single/orange-demo-single-web/src/store/actions.js index b1c6ea43..3c08aeca 100644 --- a/orange-demo-single/orange-demo-single-web/src/store/actions.js +++ b/orange-demo-single/orange-demo-single-web/src/store/actions.js @@ -1 +1,16 @@ -export default {} +// 获得消息列表数据 +function loadMessage (context, owner) { + // TODO: 获取消息列表 +} + +export default { + startMessage: (context, owner) => { + // TODO: 开始消息获取轮询 + }, + stopMessage: (context) => { + // TODO: 结束消息获取轮询 + }, + reloadMessage: (context, owner) => { + loadMessage(context, owner); + } +} diff --git a/orange-demo-single/orange-demo-single-web/src/store/getters.js b/orange-demo-single/orange-demo-single-web/src/store/getters.js index 6c458e3b..53de2d99 100644 --- a/orange-demo-single/orange-demo-single-web/src/store/getters.js +++ b/orange-demo-single/orange-demo-single-web/src/store/getters.js @@ -82,5 +82,8 @@ export default { }, getCurrentColumnId: (state) => { return state.currentColumnId; + }, + getMessageList: (state) => { + return state.messageList; } } diff --git a/orange-demo-single/orange-demo-single-web/src/store/mutations.js b/orange-demo-single/orange-demo-single-web/src/store/mutations.js index 5d755609..c6acfc97 100644 --- a/orange-demo-single/orange-demo-single-web/src/store/mutations.js +++ b/orange-demo-single/orange-demo-single-web/src/store/mutations.js @@ -157,5 +157,11 @@ export default { setCurrentColumnId: (state, columnId) => { if (setObjectToSessionStorage('currentColumnId', columnId)) state.currentColumnId = columnId; if (setObjectToSessionStorage('currentMenuId', null)) state.currentMenuId = null; + }, + setMessageTimer: (state, timerHandler) => { + state.messageTimer = timerHandler; + }, + setMessageList: (state, messageList) => { + state.messageList = messageList; } } diff --git a/orange-demo-single/orange-demo-single-web/src/store/state.js b/orange-demo-single/orange-demo-single-web/src/store/state.js index ec9597f0..0a7b88dc 100644 --- a/orange-demo-single/orange-demo-single-web/src/store/state.js +++ b/orange-demo-single/orange-demo-single-web/src/store/state.js @@ -25,5 +25,8 @@ export default { // 当前菜单 currentMenuId: getObjectFromSessionStorage('currentMenuId', undefined), // 当前栏目 - currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined) + currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined), + // 消息列表 + messageTimeer: null, + messageList: [] } diff --git a/orange-demo-single/orange-demo-single-web/src/views/generated/formClass.vue b/orange-demo-single/orange-demo-single-web/src/views/generated/formClass.vue index 130c56f5..6f8ba895 100644 --- a/orange-demo-single/orange-demo-single-web/src/views/generated/formClass.vue +++ b/orange-demo-single/orange-demo-single-web/src/views/generated/formClass.vue @@ -34,7 +34,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -462,12 +462,6 @@ export default { * 删除 */ onDeleteClick (row) { - if ( - row.classId == null - ) { - this.$message.error('请求失败，发现必填参数为空！'); - return; - } let params = { classId: row.classId }; @@ -483,13 +477,6 @@ export default { * 移除 */ onDeleteClassCourseClick (row) { - if ( - (this.formClass.StudentClass.impl.currentRow || {}).classId == null || - row.courseId == null - ) { - this.$message.error('请求失败，发现必填参数为空！'); - return; - } let params = { classId: (this.formClass.StudentClass.impl.currentRow || {}).classId, courseId: row.courseId @@ -506,13 +493,6 @@ export default { * 移除 */ onDeleteClassStudentClick (row) { - if ( - (this.formClass.StudentClass.impl.currentRow || {}).classId == null || - row.studentId == null - ) { - this.$message.error('请求失败，发现必填参数为空！'); - return; - } let params = { classId: (this.formClass.StudentClass.impl.currentRow || {}).classId, studentId: row.studentId diff --git a/orange-demo-single/orange-demo-single-web/src/views/generated/formCourse.vue b/orange-demo-single/orange-demo-single-web/src/views/generated/formCourse.vue index 83c918e4..e9b4e3c2 100644 --- a/orange-demo-single/orange-demo-single-web/src/views/generated/formCourse.vue +++ b/orange-demo-single/orange-demo-single-web/src/views/generated/formCourse.vue @@ -102,6 +102,8 @@ - diff --git a/orange-demo-single/orange-demo-single-web/src/views/upms/formSysDept/index.vue b/orange-demo-single/orange-demo-single-web/src/views/upms/formSysDept/index.vue index 02d1d973..0c3a9a0b 100644 --- a/orange-demo-single/orange-demo-single-web/src/views/upms/formSysDept/index.vue +++ b/orange-demo-single/orange-demo-single-web/src/views/upms/formSysDept/index.vue @@ -78,6 +78,13 @@ export default { params.sysDeptDtoFilter = { deptName: this.formSysDept.formFilterCopy.deptName }; + // 按照显示顺序排序 + params.orderParam = [ + { + fieldName: 'showOrder', + asc: true + } + ]; return new Promise((resolve, reject) => { SysDeptController.list(this, params).then(res => { resolve({