From 4f4995e6f0a38c4e55499f0c64f30aab4ae1054d Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Wed, 1 Sep 2021 20:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A51.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
orange-demo-multi-service/.idea/.name | 1 -
.../inspectionProfiles/Project_Default.xml | 51 ---
...Maven__com_baomidou_mybatis_plus_3_4_2.xml | 13 -
...baomidou_mybatis_plus_annotation_3_4_2.xml | 13 -
...omidou_mybatis_plus_boot_starter_3_4_2.xml | 13 -
...__com_baomidou_mybatis_plus_core_3_4_2.xml | 13 -
..._baomidou_mybatis_plus_extension_3_4_2.xml | 13 -
...aven__com_orange_demo_common_log_1_0_0.xml | 13 +
..._javax_persistence_persistence_api_1_0.xml | 13 +
...l => Maven__org_mybatis_mybatis_3_4_6.xml} | 8 +-
...ven__org_mybatis_mybatis_spring_1_3_2.xml} | 8 +-
.../Maven__tk_mybatis_mapper_base_1_1_5.xml | 13 +
.../Maven__tk_mybatis_mapper_core_1_1_5.xml | 13 +
.../Maven__tk_mybatis_mapper_extra_1_1_5.xml | 13 +
.../Maven__tk_mybatis_mapper_spring_1_1_5.xml | 13 +
...mapper_spring_boot_autoconfigure_2_1_5.xml | 13 +
...batis_mapper_spring_boot_starter_2_1_5.xml | 13 +
...Maven__tk_mybatis_mapper_weekend_1_1_5.xml | 13 +
orange-demo-multi-service/.idea/workspace.xml | 27 +-
.../course-class-api/course-class-api.iml | 17 +-
.../course-class-service.iml | 18 +-
.../course-class/course-class-service/pom.xml | 5 +
.../config/DataSourceConfig.java | 2 +-
.../courseclassservice/model/AreaCode.java | 14 +-
.../courseclassservice/model/ClassCourse.java | 12 +-
.../model/ClassStudent.java | 10 +-
.../demo/courseclassservice/model/Course.java | 43 +-
.../demo/courseclassservice/model/Grade.java | 13 +-
.../model/MaterialEdition.java | 10 +-
.../courseclassservice/model/SchoolInfo.java | 17 +-
.../courseclassservice/model/Student.java | 55 +--
.../model/StudentClass.java | 30 +-
.../service/impl/CourseServiceImpl.java | 10 +-
.../service/impl/SchoolInfoServiceImpl.java | 7 +-
.../service/impl/StudentClassServiceImpl.java | 43 +-
.../service/impl/StudentServiceImpl.java | 10 +-
.../application/gateway/gateway.iml | 19 +-
.../application/stats/stats-api/stats-api.iml | 17 +-
.../application/stats/stats-service/pom.xml | 5 +
.../statsservice/config/DataSourceConfig.java | 2 +-
.../statsservice/model/CourseTransStats.java | 36 +-
.../orange/demo/statsservice/model/Grade.java | 13 +-
.../demo/statsservice/model/SchoolInfo.java | 13 +-
.../model/StudentActionStats.java | 57 +--
.../model/StudentActionTrans.java | 47 +-
.../impl/StudentActionTransServiceImpl.java | 7 +-
.../stats/stats-service/stats-service.iml | 18 +-
.../application/upms/upms-api/upms-api.iml | 17 +-
.../application/upms/upms-service/pom.xml | 5 +
.../upmsservice/config/DataSourceConfig.java | 2 +-
.../controller/LoginController.java | 7 +-
.../controller/SysUserController.java | 13 +-
.../demo/upmsservice/model/SysMenu.java | 28 +-
.../upmsservice/model/SysMenuPermCode.java | 11 +-
.../demo/upmsservice/model/SysPerm.java | 20 +-
.../demo/upmsservice/model/SysPermCode.java | 24 +-
.../upmsservice/model/SysPermCodePerm.java | 11 +-
.../demo/upmsservice/model/SysPermModule.java | 22 +-
.../upmsservice/model/SysPermWhitelist.java | 12 +-
.../demo/upmsservice/model/SysRole.java | 16 +-
.../demo/upmsservice/model/SysRoleMenu.java | 11 +-
.../demo/upmsservice/model/SysUser.java | 32 +-
.../demo/upmsservice/model/SysUserRole.java | 11 +-
.../upmsservice/service/SysUserService.java | 8 +-
.../service/impl/SysMenuServiceImpl.java | 55 ++-
.../service/impl/SysPermCodeServiceImpl.java | 23 +-
.../impl/SysPermModuleServiceImpl.java | 5 +-
.../service/impl/SysPermServiceImpl.java | 27 +-
.../service/impl/SysRoleServiceImpl.java | 26 +-
.../service/impl/SysUserServiceImpl.java | 44 +-
.../upms/upms-service/upms-service.iml | 18 +-
.../common/common-core/common-core.iml | 17 +-
.../common/common-core/pom.xml | 6 +-
.../core/annotation/DeletedFlagColumn.java | 16 +
.../core/aop/DataSourceResolveAspect.java | 2 +-
.../common/core/aop/DictCacheSyncAspect.java | 16 +-
.../core/base/controller/BaseController.java | 7 +-
.../common/core/base/dao/BaseDaoMapper.java | 7 +-
.../common/core/base/model/BaseModel.java | 10 +-
.../core/base/service/BaseDictService.java | 30 +-
.../common/core/base/service/BaseService.java | 404 +++++++++++-------
.../core/base/service/IBaseDictService.java | 3 +-
.../core/base/service/IBaseService.java | 38 +-
.../demo/common/core/config/FeignConfig.java | 3 +
.../common/core/constant/AppDeviceType.java | 59 +++
.../common/core/object/LoginUserInfo.java | 4 +
.../common/core/object/ResponseResult.java | 6 +-
.../demo/common/core/object/TokenData.java | 8 +
.../demo/common/core/util/MyCommonUtil.java | 19 +
.../demo/common/core/util/MyModelUtil.java | 64 ++-
.../demo/common/core/util/RedisKeyUtil.java | 11 +
.../common/common-redis/common-redis.iml | 17 +-
.../common-sequence/common-sequence.iml | 17 +-
.../common/common-swagger/common-swagger.iml | 17 +-
orange-demo-multi-service/pom.xml | 3 +-
.../config-data/course-class-dev.yaml | 16 +-
.../zz-resource/config-data/stats-dev.yaml | 16 +-
.../zz-resource/config-data/upms-dev.yaml | 15 +-
.../zz-resource/pinpoint-docker-master/.env | 110 +++++
.../pinpoint-docker-master/.gitignore | 1 +
.../pinpoint-docker-master/License | 201 +++++++++
.../pinpoint-docker-master/Readme.md | 175 ++++++++
.../pinpoint-docker-master/docker-compose.yml | 261 +++++++++++
.../docs/Pinpoint-Flink upload.png | Bin 0 -> 354790 bytes
.../pinpoint-docker-master/docs/logo.png | Bin 0 -> 3757 bytes
.../pinpoint-agent-attach-example/java/.env | 5 +
.../java/Dockerfile | 15 +
.../java/build/Sample.java | 14 +
.../java/docker-compose.yml | 22 +
.../pinpoint-agent-attach-example/tomcat/.env | 6 +
.../tomcat/docker-compose.yml | 22 +
.../pinpoint-agent/.env | 27 ++
.../pinpoint-agent/Dockerfile | 24 ++
.../pinpoint-agent/Readme.md | 44 ++
.../build/scripts/configure-agent.sh | 25 ++
.../pinpoint-agent/docker-compose.yml | 40 ++
.../pinpoint-collector/.env | 28 ++
.../pinpoint-collector/Dockerfile | 23 +
.../pinpoint-collector/Readme.md | 44 ++
.../build/scripts/start-collector.sh | 15 +
.../pinpoint-collector/docker-compose.yml | 45 ++
.../pinpoint-flink/.env | 7 +
.../pinpoint-flink/build/hbase.properties | 45 ++
.../build/pinpoint-flink.properties | 62 +++
.../pinpoint-flink/docker-compose.yml | 45 ++
.../pinpoint-hbase/.env | 8 +
.../pinpoint-hbase/Dockerfile | 32 ++
.../pinpoint-hbase/Readme.md | 44 ++
.../pinpoint-hbase/docker-compose.yml | 34 ++
.../pinpoint-hbase/hbase-site.xml | 18 +
.../pinpoint-mysql/.env | 7 +
.../pinpoint-mysql/Dockerfile | 11 +
.../pinpoint-mysql/Readme.md | 44 ++
.../pinpoint-mysql/docker-compose.yml | 25 ++
.../pinpoint-docker-master/pinpoint-web/.env | 49 +++
.../pinpoint-web/Dockerfile | 21 +
.../pinpoint-web/Readme.md | 44 ++
.../pinpoint-web/build/mail.zip | Bin 0 -> 3959 bytes
.../pinpoint-web/build/scripts/start-web.sh | 85 ++++
.../pinpoint-web/docker-compose.yml | 50 +++
.../pinpoint-zookeeper/docker-compose.yml | 38 ++
.../application-webadmin/pom.xml | 5 +
.../demo/webadmin/app/model/AreaCode.java | 14 +-
.../demo/webadmin/app/model/ClassCourse.java | 12 +-
.../demo/webadmin/app/model/ClassStudent.java | 10 +-
.../demo/webadmin/app/model/Course.java | 43 +-
.../webadmin/app/model/CourseTransStats.java | 34 +-
.../orange/demo/webadmin/app/model/Grade.java | 13 +-
.../webadmin/app/model/MaterialEdition.java | 10 +-
.../demo/webadmin/app/model/SchoolInfo.java | 17 +-
.../demo/webadmin/app/model/Student.java | 55 +--
.../app/model/StudentActionStats.java | 57 +--
.../app/model/StudentActionTrans.java | 47 +-
.../demo/webadmin/app/model/StudentClass.java | 30 +-
.../app/service/impl/CourseServiceImpl.java | 10 +-
.../service/impl/SchoolInfoServiceImpl.java | 7 +-
.../impl/StudentActionTransServiceImpl.java | 7 +-
.../service/impl/StudentClassServiceImpl.java | 43 +-
.../app/service/impl/StudentServiceImpl.java | 10 +-
.../webadmin/config/DataSourceConfig.java | 2 +-
.../upms/controller/LoginController.java | 7 +-
.../upms/controller/SysUserController.java | 13 +-
.../demo/webadmin/upms/model/SysMenu.java | 36 +-
.../webadmin/upms/model/SysMenuPermCode.java | 11 +-
.../demo/webadmin/upms/model/SysPerm.java | 28 +-
.../demo/webadmin/upms/model/SysPermCode.java | 32 +-
.../webadmin/upms/model/SysPermCodePerm.java | 11 +-
.../webadmin/upms/model/SysPermModule.java | 30 +-
.../webadmin/upms/model/SysPermWhitelist.java | 12 +-
.../demo/webadmin/upms/model/SysRole.java | 24 +-
.../demo/webadmin/upms/model/SysRoleMenu.java | 11 +-
.../demo/webadmin/upms/model/SysUser.java | 40 +-
.../demo/webadmin/upms/model/SysUserRole.java | 11 +-
.../webadmin/upms/service/SysUserService.java | 8 +-
.../upms/service/impl/SysMenuServiceImpl.java | 55 ++-
.../service/impl/SysPermCodeServiceImpl.java | 25 +-
.../impl/SysPermModuleServiceImpl.java | 5 +-
.../upms/service/impl/SysPermServiceImpl.java | 27 +-
.../upms/service/impl/SysRoleServiceImpl.java | 26 +-
.../upms/service/impl/SysUserServiceImpl.java | 44 +-
.../src/main/resources/application.yml | 17 +-
.../common/common-core/pom.xml | 6 +-
.../core/annotation/DeletedFlagColumn.java | 16 +
.../core/aop/DataSourceResolveAspect.java | 2 +-
.../common/core/aop/DictCacheSyncAspect.java | 16 +-
.../common/core/base/dao/BaseDaoMapper.java | 7 +-
.../core/base/service/BaseDictService.java | 30 +-
.../common/core/base/service/BaseService.java | 404 +++++++++++-------
.../core/base/service/IBaseDictService.java | 3 +-
.../core/base/service/IBaseService.java | 38 +-
.../common/core/constant/AppDeviceType.java | 59 +++
.../common/core/object/LoginUserInfo.java | 4 +
.../common/core/object/ResponseResult.java | 6 +-
.../demo/common/core/object/TokenData.java | 8 +
.../demo/common/core/util/MyCommonUtil.java | 19 +
.../demo/common/core/util/MyModelUtil.java | 64 ++-
.../demo/common/core/util/RedisKeyUtil.java | 11 +
orange-demo-single-service/pom.xml | 3 +-
198 files changed, 4017 insertions(+), 1500 deletions(-)
delete mode 100644 orange-demo-multi-service/.idea/.name
delete mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
delete mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
delete mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
delete mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
delete mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__com_orange_demo_common_log_1_0_0.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml
rename orange-demo-multi-service/.idea/libraries/{Maven__org_mybatis_mybatis_3_5_5.xml => Maven__org_mybatis_mybatis_3_4_6.xml} (68%)
rename orange-demo-multi-service/.idea/libraries/{Maven__org_mybatis_mybatis_spring_2_0_5.xml => Maven__org_mybatis_mybatis_spring_1_3_2.xml} (62%)
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_base_1_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_core_1_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_1_5.xml
create mode 100644 orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_5.xml
create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AppDeviceType.java
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/.gitignore
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/License
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/docs/Pinpoint-Flink upload.png
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/docs/logo.png
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/java/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/java/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/java/build/Sample.java
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/java/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/tomcat/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent-attach-example/tomcat/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent/build/scripts/configure-agent.sh
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-agent/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-collector/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-collector/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-collector/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-collector/build/scripts/start-collector.sh
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-collector/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-flink/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-flink/build/hbase.properties
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-flink/build/pinpoint-flink.properties
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-flink/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-hbase/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-hbase/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-hbase/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-hbase/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-hbase/hbase-site.xml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-mysql/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-mysql/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-mysql/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-mysql/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/.env
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/Dockerfile
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/Readme.md
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/build/mail.zip
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/build/scripts/start-web.sh
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-web/docker-compose.yml
create mode 100644 orange-demo-multi-service/zz-resource/pinpoint-docker-master/pinpoint-zookeeper/docker-compose.yml
create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AppDeviceType.java
diff --git a/orange-demo-multi-service/.idea/.name b/orange-demo-multi-service/.idea/.name
deleted file mode 100644
index eaf507fb..00000000
--- a/orange-demo-multi-service/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-OrangeMultiDemo
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/inspectionProfiles/Project_Default.xml b/orange-demo-multi-service/.idea/inspectionProfiles/Project_Default.xml
index c562afbb..fc8488e1 100644
--- a/orange-demo-multi-service/.idea/inspectionProfiles/Project_Default.xml
+++ b/orange-demo-multi-service/.idea/inspectionProfiles/Project_Default.xml
@@ -14,57 +14,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
deleted file mode 100644
index 2303492c..00000000
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
deleted file mode 100644
index 6aa04155..00000000
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
deleted file mode 100644
index 7038c58d..00000000
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
deleted file mode 100644
index ce4ef9dc..00000000
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
deleted file mode 100644
index 3a86667f..00000000
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_orange_demo_common_log_1_0_0.xml b/orange-demo-multi-service/.idea/libraries/Maven__com_orange_demo_common_log_1_0_0.xml
new file mode 100644
index 00000000..3e632bf8
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__com_orange_demo_common_log_1_0_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml b/orange-demo-multi-service/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml
new file mode 100644
index 00000000..e60370e5
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
similarity index 68%
rename from orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml
rename to orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
index c6b73345..377b7a72 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml
+++ b/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
similarity index 62%
rename from orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml
rename to orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
index eb39604a..713f6040 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml
+++ b/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_base_1_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_base_1_1_5.xml
new file mode 100644
index 00000000..14970473
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_base_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_core_1_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_core_1_1_5.xml
new file mode 100644
index 00000000..00217b67
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_core_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_1_5.xml
new file mode 100644
index 00000000..9fa6cf7e
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_1_5.xml
new file mode 100644
index 00000000..488a0827
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_1_5.xml
new file mode 100644
index 00000000..5a76248b
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_1_5.xml
new file mode 100644
index 00000000..69ca4ac2
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_5.xml b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_5.xml
new file mode 100644
index 00000000..2cc0e828
--- /dev/null
+++ b/orange-demo-multi-service/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/workspace.xml b/orange-demo-multi-service/.idea/workspace.xml
index 63e6cc1f..50540720 100644
--- a/orange-demo-multi-service/.idea/workspace.xml
+++ b/orange-demo-multi-service/.idea/workspace.xml
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
@@ -27,16 +27,11 @@
-
+
-
-
-
-
-
-
+
@@ -83,22 +78,16 @@
-
- 1628849582125
+
+ 1630486016377
- 1628849582125
-
+ 1630486016377
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml b/orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml
index 088b0d54..b9227508 100644
--- a/orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml
+++ b/orange-demo-multi-service/application/course-class/course-class-api/course-class-api.iml
@@ -65,20 +65,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml b/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
index 12e8cf7d..4fffadc8 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
+++ b/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
@@ -64,20 +64,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -99,6 +102,7 @@
+
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/pom.xml b/orange-demo-multi-service/application/course-class/course-class-service/pom.xml
index 96656a00..590e3af7 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/pom.xml
+++ b/orange-demo-multi-service/application/course-class/course-class-service/pom.xml
@@ -20,6 +20,11 @@
course-class-api
1.0.0
+
+ com.orange.demo
+ common-log
+ 1.0.0
+
com.orange.demo
common-redis
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
index 102ed2f5..32050215 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
import javax.sql.DataSource;
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
index 518e5f03..561468e8 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
@@ -1,8 +1,9 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 行政区划实体对象。
*
@@ -10,30 +11,31 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_area_code")
+@Table(name = "zz_area_code")
public class AreaCode {
/**
* 行政区划主键Id
*/
- @TableId(value = "area_id")
+ @Id
+ @Column(name = "area_id")
private Long areaId;
/**
* 行政区划名称
*/
- @TableField(value = "area_name")
+ @Column(name = "area_name")
private String areaName;
/**
* 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
*/
- @TableField(value = "area_level")
+ @Column(name = "area_level")
private Integer areaLevel;
/**
* 父级行政区划Id
*/
- @TableField(value = "parent_id")
+ @Column(name = "parent_id")
private Long parentId;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
index 77f05154..b34238d6 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
@@ -1,7 +1,7 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
/**
* ClassCourse实体对象。
@@ -10,24 +10,26 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_class_course")
+@Table(name = "zz_class_course")
public class ClassCourse {
/**
* 班级Id。
*/
- @TableField(value = "class_id")
+ @Id
+ @Column(name = "class_id")
private Long classId;
/**
* 课程Id。
*/
- @TableField(value = "course_id")
+ @Id
+ @Column(name = "course_id")
private Long courseId;
/**
* 课程顺序(数值越小越靠前)。
*/
- @TableField(value = "course_order")
+ @Column(name = "course_order")
private Integer courseOrder;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
index 989250af..e3af4e09 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
@@ -1,7 +1,7 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
/**
* ClassStudent实体对象。
@@ -10,18 +10,20 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_class_student")
+@Table(name = "zz_class_student")
public class ClassStudent {
/**
* 班级Id。
*/
- @TableField(value = "class_id")
+ @Id
+ @Column(name = "class_id")
private Long classId;
/**
* 学生Id。
*/
- @TableField(value = "student_id")
+ @Id
+ @Column(name = "student_id")
private Long studentId;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
index 6b3c779c..b2f0b4fe 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.courseclassapi.vo.CourseVo;
import com.orange.demo.courseclassapi.constant.CourseDifficult;
import com.orange.demo.application.common.constant.Subject;
@@ -12,6 +11,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.math.BigDecimal;
import java.util.Date;
@@ -24,19 +24,20 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_course")
+@Table(name = "zz_course")
public class Course {
/**
* 主键Id。
*/
- @TableId(value = "course_id")
+ @Id
+ @Column(name = "course_id")
private Long courseId;
/**
* 课程名称。
*/
- @TableField(value = "course_name")
+ @Column(name = "course_name")
private String courseName;
/**
@@ -57,86 +58,86 @@ public class Course {
/**
* 年级Id。
*/
- @TableField(value = "grade_id")
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 学科Id。
*/
- @TableField(value = "subject_id")
+ @Column(name = "subject_id")
private Integer subjectId;
/**
* 课时数量。
*/
- @TableField(value = "class_hour")
+ @Column(name = "class_hour")
private Integer classHour;
/**
* 多张课程图片地址。
*/
@UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
- @TableField(value = "picture_url")
+ @Column(name = "picture_url")
private String pictureUrl;
/**
* 创建用户Id。
*/
- @TableField(value = "create_user_id")
+ @Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
- @TableField(value = "create_time")
+ @Column(name = "create_time")
private Date createTime;
/**
* 最后修改时间。
*/
- @TableField(value = "update_time")
+ @Column(name = "update_time")
private Date updateTime;
/**
* price 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private BigDecimal priceStart;
/**
* price 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private BigDecimal priceEnd;
/**
* classHour 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private Integer classHourStart;
/**
* classHour 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private Integer classHourEnd;
/**
* updateTime 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String updateTimeStart;
/**
* updateTime 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String updateTimeEnd;
/**
* courseId 的多对多关联表数据对象。
*/
- @TableField(exist = false)
+ @Transient
private ClassCourse classCourse;
@RelationDict(
@@ -145,19 +146,19 @@ public class Course {
slaveModelClass = Grade.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
- @TableField(exist = false)
+ @Transient
private Map gradeIdDictMap;
@RelationConstDict(
masterIdField = "difficulty",
constantDictClass = CourseDifficult.class)
- @TableField(exist = false)
+ @Transient
private Map difficultyDictMap;
@RelationConstDict(
masterIdField = "subjectId",
constantDictClass = Subject.class)
- @TableField(exist = false)
+ @Transient
private Map subjectIdDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
index 0164e2dc..2c884001 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
@@ -1,7 +1,8 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
+import javax.persistence.*;
/**
* Grade实体对象。
@@ -10,24 +11,26 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_grade")
+@Table(name = "zz_grade")
public class Grade {
/**
* 主键Id。
*/
- @TableId(value = "grade_id", type = IdType.AUTO)
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 年级名称。
*/
- @TableField(value = "grade_name")
+ @Column(name = "grade_name")
private String gradeName;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
+ @DeletedFlagColumn
private Integer status;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
index 60eb31b0..1a23af88 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
@@ -1,7 +1,7 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
/**
* MaterialEdition实体对象。
@@ -10,19 +10,21 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_material_edition")
+@Table(name = "zz_material_edition")
public class MaterialEdition {
/**
* 主键Id。
*/
- @TableId(value = "edition_id", type = IdType.AUTO)
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "edition_id")
private Integer editionId;
/**
* 教材版本名称。
*/
- @TableField(value = "edition_name")
+ @Column(name = "edition_name")
private String editionName;
/**
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
index c85b2fa8..f9a792dd 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
@@ -1,12 +1,12 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Map;
@@ -17,31 +17,32 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_school_info")
+@Table(name = "zz_school_info")
public class SchoolInfo {
/**
* 学校Id。
*/
- @TableId(value = "school_id")
+ @Id
+ @Column(name = "school_id")
private Long schoolId;
/**
* 学校名称。
*/
- @TableField(value = "school_name")
+ @Column(name = "school_name")
private String schoolName;
/**
* 所在省Id。
*/
- @TableField(value = "province_id")
+ @Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
- @TableField(value = "city_id")
+ @Column(name = "city_id")
private Long cityId;
@RelationDict(
@@ -50,7 +51,7 @@ public class SchoolInfo {
slaveModelClass = AreaCode.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map provinceIdDictMap;
@RelationDict(
@@ -59,7 +60,7 @@ public class SchoolInfo {
slaveModelClass = AreaCode.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map cityIdDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
index b2158cf3..c0d8900e 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.courseclassapi.vo.StudentVo;
import com.orange.demo.application.common.constant.Gender;
import com.orange.demo.application.common.constant.ExpLevel;
@@ -12,6 +11,7 @@ import com.orange.demo.common.core.util.MyCommonUtil;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -23,43 +23,44 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_student")
+@Table(name = "zz_student")
public class Student {
/**
* 学生Id。
*/
- @TableId(value = "student_id")
+ @Id
+ @Column(name = "student_id")
private Long studentId;
/**
* 登录手机。
*/
- @TableField(value = "login_mobile")
+ @Column(name = "login_mobile")
private String loginMobile;
/**
* 学生姓名。
*/
- @TableField(value = "student_name")
+ @Column(name = "student_name")
private String studentName;
/**
* 所在省份Id。
*/
- @TableField(value = "province_id")
+ @Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
- @TableField(value = "city_id")
+ @Column(name = "city_id")
private Long cityId;
/**
* 区县Id。
*/
- @TableField(value = "district_id")
+ @Column(name = "district_id")
private Long districtId;
/**
@@ -75,37 +76,37 @@ public class Student {
/**
* 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
*/
- @TableField(value = "experience_level")
+ @Column(name = "experience_level")
private Integer experienceLevel;
/**
* 总共充值学币数量。
*/
- @TableField(value = "total_coin")
+ @Column(name = "total_coin")
private Integer totalCoin;
/**
* 可用学币数量。
*/
- @TableField(value = "left_coin")
+ @Column(name = "left_coin")
private Integer leftCoin;
/**
* 年级Id。
*/
- @TableField(value = "grade_id")
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 校区Id。
*/
- @TableField(value = "school_id")
+ @Column(name = "school_id")
private Long schoolId;
/**
* 注册时间。
*/
- @TableField(value = "register_time")
+ @Column(name = "register_time")
private Date registerTime;
/**
@@ -116,31 +117,31 @@ public class Student {
/**
* birthday 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String birthdayStart;
/**
* birthday 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String birthdayEnd;
/**
* registerTime 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String registerTimeStart;
/**
* registerTime 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String registerTimeEnd;
/**
* true LIKE搜索字符串。
*/
- @TableField(exist = false)
+ @Transient
private String searchString;
public void setSearchString(String searchString) {
@@ -153,7 +154,7 @@ public class Student {
slaveModelClass = AreaCode.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map provinceIdDictMap;
@RelationDict(
@@ -162,7 +163,7 @@ public class Student {
slaveModelClass = AreaCode.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map cityIdDictMap;
@RelationDict(
@@ -171,7 +172,7 @@ public class Student {
slaveModelClass = AreaCode.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map districtIdDictMap;
@RelationDict(
@@ -180,7 +181,7 @@ public class Student {
slaveModelClass = Grade.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
- @TableField(exist = false)
+ @Transient
private Map gradeIdDictMap;
@RelationDict(
@@ -189,25 +190,25 @@ public class Student {
slaveModelClass = SchoolInfo.class,
slaveIdField = "schoolId",
slaveNameField = "schoolName")
- @TableField(exist = false)
+ @Transient
private Map schoolIdDictMap;
@RelationConstDict(
masterIdField = "gender",
constantDictClass = Gender.class)
- @TableField(exist = false)
+ @Transient
private Map genderDictMap;
@RelationConstDict(
masterIdField = "experienceLevel",
constantDictClass = ExpLevel.class)
- @TableField(exist = false)
+ @Transient
private Map experienceLevelDictMap;
@RelationConstDict(
masterIdField = "status",
constantDictClass = StudentStatus.class)
- @TableField(exist = false)
+ @Transient
private Map statusDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
index 7efbb4f3..f78a3129 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
@@ -1,14 +1,15 @@
package com.orange.demo.courseclassservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.courseclassapi.vo.StudentClassVo;
import com.orange.demo.courseclassapi.constant.ClassLevel;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -20,61 +21,62 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_class")
+@Table(name = "zz_class")
public class StudentClass {
/**
* 班级Id。
*/
- @TableId(value = "class_id")
+ @Id
+ @Column(name = "class_id")
private Long classId;
/**
* 班级名称。
*/
- @TableField(value = "class_name")
+ @Column(name = "class_name")
private String className;
/**
* 学校Id。
*/
- @TableField(value = "school_id")
+ @Column(name = "school_id")
private Long schoolId;
/**
* 学生班长Id。
*/
- @TableField(value = "leader_id")
+ @Column(name = "leader_id")
private Long leaderId;
/**
* 已完成课时数量。
*/
- @TableField(value = "finish_class_hour")
+ @Column(name = "finish_class_hour")
private Integer finishClassHour;
/**
* 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
*/
- @TableField(value = "class_level")
+ @Column(name = "class_level")
private Integer classLevel;
/**
* 创建用户。
*/
- @TableField(value = "create_user_id")
+ @Column(name = "create_user_id")
private Long createUserId;
/**
* 班级创建时间。
*/
- @TableField(value = "create_time")
+ @Column(name = "create_time")
private Date createTime;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
+ @DeletedFlagColumn
private Integer status;
@RelationDict(
@@ -83,7 +85,7 @@ public class StudentClass {
slaveModelClass = SchoolInfo.class,
slaveIdField = "schoolId",
slaveNameField = "schoolName")
- @TableField(exist = false)
+ @Transient
private Map schoolIdDictMap;
@RelationDict(
@@ -92,13 +94,13 @@ public class StudentClass {
slaveModelClass = Student.class,
slaveIdField = "studentId",
slaveNameField = "studentName")
- @TableField(exist = false)
+ @Transient
private Map leaderIdDictMap;
@RelationConstDict(
masterIdField = "classLevel",
constantDictClass = ClassLevel.class)
- @TableField(exist = false)
+ @Transient
private Map classLevelDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/CourseServiceImpl.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/CourseServiceImpl.java
index 89fac674..7748f85e 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/CourseServiceImpl.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/CourseServiceImpl.java
@@ -1,7 +1,5 @@
package com.orange.demo.courseclassservice.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
@@ -82,8 +80,7 @@ public class CourseServiceImpl extends BaseService implements Cour
course.setCreateTime(originalCourse.getCreateTime());
course.setUpdateTime(new Date());
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(course, course.getCourseId());
- return courseMapper.update(course, uw) == 1;
+ return courseMapper.updateByPrimaryKey(course) == 1;
}
/**
@@ -95,13 +92,14 @@ public class CourseServiceImpl extends BaseService implements Cour
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long courseId) {
- if (courseMapper.deleteById(courseId) == 0) {
+ // 这里先删除主数据
+ if (!this.removeById(courseId)) {
return false;
}
// 开始删除与本地多对多父表的关联
ClassCourse classCourse = new ClassCourse();
classCourse.setCourseId(courseId);
- classCourseMapper.delete(new QueryWrapper<>(classCourse));
+ classCourseMapper.delete(classCourse);
return true;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/SchoolInfoServiceImpl.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/SchoolInfoServiceImpl.java
index d7dfa442..e9c11b27 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/SchoolInfoServiceImpl.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/SchoolInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.orange.demo.courseclassservice.service.impl;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
@@ -70,8 +69,7 @@ public class SchoolInfoServiceImpl extends BaseService impleme
@Override
public boolean update(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo) {
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(schoolInfo, schoolInfo.getSchoolId());
- return schoolInfoMapper.update(schoolInfo, uw) == 1;
+ return schoolInfoMapper.updateByPrimaryKey(schoolInfo) == 1;
}
/**
@@ -83,7 +81,8 @@ public class SchoolInfoServiceImpl extends BaseService impleme
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long schoolId) {
- return schoolInfoMapper.deleteById(schoolId) == 1;
+ // 这里先删除主数据
+ return this.removeById(schoolId);
}
/**
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentClassServiceImpl.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentClassServiceImpl.java
index b61dd5b3..948a8cbb 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentClassServiceImpl.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentClassServiceImpl.java
@@ -1,7 +1,5 @@
package com.orange.demo.courseclassservice.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
@@ -18,6 +16,7 @@ import com.github.pagehelper.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import java.util.*;
@@ -84,9 +83,9 @@ public class StudentClassServiceImpl extends BaseService imp
public boolean update(StudentClass studentClass, StudentClass originalStudentClass) {
studentClass.setCreateUserId(originalStudentClass.getCreateUserId());
studentClass.setCreateTime(originalStudentClass.getCreateTime());
+ studentClass.setStatus(GlobalDeletedFlag.NORMAL);
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(studentClass, studentClass.getClassId());
- return studentClassMapper.update(studentClass, uw) == 1;
+ return studentClassMapper.updateByPrimaryKey(studentClass) == 1;
}
/**
@@ -98,16 +97,17 @@ public class StudentClassServiceImpl extends BaseService imp
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long classId) {
- if (studentClassMapper.deleteById(classId) == 0) {
+ // 这里先删除主数据
+ if (!this.removeById(classId)) {
return false;
}
// 开始删除多对多中间表的关联
ClassCourse classCourse = new ClassCourse();
classCourse.setClassId(classId);
- classCourseMapper.delete(new QueryWrapper<>(classCourse));
+ classCourseMapper.delete(classCourse);
ClassStudent classStudent = new ClassStudent();
classStudent.setClassId(classId);
- classStudentMapper.delete(new QueryWrapper<>(classStudent));
+ classStudentMapper.delete(classStudent);
return true;
}
@@ -197,8 +197,8 @@ public class StudentClassServiceImpl extends BaseService imp
for (ClassCourse classCourse : classCourseList) {
classCourse.setClassId(classId);
MyModelUtil.setDefaultValue(classCourse, "courseOrder", 0);
- classCourseMapper.insert(classCourse);
}
+ classCourseMapper.insertList(classCourseList);
}
/**
@@ -210,13 +210,11 @@ public class StudentClassServiceImpl extends BaseService imp
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateClassCourse(ClassCourse classCourse) {
- ClassCourse filter = new ClassCourse();
- filter.setClassId(classCourse.getClassId());
- filter.setCourseId(classCourse.getCourseId());
- UpdateWrapper uw =
- BaseService.createUpdateQueryForNullValue(classCourse, ClassCourse.class);
- uw.setEntity(filter);
- return classCourseMapper.update(classCourse, uw) > 0;
+ Example e = new Example(ClassCourse.class);
+ e.createCriteria()
+ .andEqualTo("classId", classCourse.getClassId())
+ .andEqualTo("courseId", classCourse.getCourseId());
+ return classCourseMapper.updateByExample(classCourse, e) > 0;
}
/**
@@ -228,10 +226,11 @@ public class StudentClassServiceImpl extends BaseService imp
*/
@Override
public ClassCourse getClassCourse(Long classId, Long courseId) {
- ClassCourse filter = new ClassCourse();
- filter.setClassId(classId);
- filter.setCourseId(courseId);
- return classCourseMapper.selectOne(new QueryWrapper<>(filter));
+ Example e = new Example(ClassCourse.class);
+ e.createCriteria()
+ .andEqualTo("classId", classId)
+ .andEqualTo("courseId", courseId);
+ return classCourseMapper.selectOneByExample(e);
}
/**
@@ -247,7 +246,7 @@ public class StudentClassServiceImpl extends BaseService imp
ClassCourse filter = new ClassCourse();
filter.setClassId(classId);
filter.setCourseId(courseId);
- return classCourseMapper.delete(new QueryWrapper<>(filter)) > 0;
+ return classCourseMapper.delete(filter) > 0;
}
/**
@@ -261,8 +260,8 @@ public class StudentClassServiceImpl extends BaseService imp
public void addClassStudentList(List classStudentList, Long classId) {
for (ClassStudent classStudent : classStudentList) {
classStudent.setClassId(classId);
- classStudentMapper.insert(classStudent);
}
+ classStudentMapper.insertList(classStudentList);
}
/**
@@ -278,7 +277,7 @@ public class StudentClassServiceImpl extends BaseService imp
ClassStudent filter = new ClassStudent();
filter.setClassId(classId);
filter.setStudentId(studentId);
- return classStudentMapper.delete(new QueryWrapper<>(filter)) > 0;
+ return classStudentMapper.delete(filter) > 0;
}
/**
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java
index 79bd483e..1c6c1931 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/impl/StudentServiceImpl.java
@@ -1,7 +1,5 @@
package com.orange.demo.courseclassservice.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.application.common.constant.StudentStatus;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassservice.dao.*;
@@ -81,8 +79,7 @@ public class StudentServiceImpl extends BaseService implements St
@Override
public boolean update(Student student, Student originalStudent) {
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(student, student.getStudentId());
- return studentMapper.update(student, uw) == 1;
+ return studentMapper.updateByPrimaryKey(student) == 1;
}
/**
@@ -94,13 +91,14 @@ public class StudentServiceImpl extends BaseService implements St
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long studentId) {
- if (studentMapper.deleteById(studentId) == 0) {
+ // 这里先删除主数据
+ if (!this.removeById(studentId)) {
return false;
}
// 开始删除与本地多对多父表的关联
ClassStudent classStudent = new ClassStudent();
classStudent.setStudentId(studentId);
- classStudentMapper.delete(new QueryWrapper<>(classStudent));
+ classStudentMapper.delete(classStudent);
return true;
}
diff --git a/orange-demo-multi-service/application/gateway/gateway.iml b/orange-demo-multi-service/application/gateway/gateway.iml
index c9a58174..3c78d199 100644
--- a/orange-demo-multi-service/application/gateway/gateway.iml
+++ b/orange-demo-multi-service/application/gateway/gateway.iml
@@ -110,21 +110,23 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -178,6 +180,7 @@
+
diff --git a/orange-demo-multi-service/application/stats/stats-api/stats-api.iml b/orange-demo-multi-service/application/stats/stats-api/stats-api.iml
index 088b0d54..b9227508 100644
--- a/orange-demo-multi-service/application/stats/stats-api/stats-api.iml
+++ b/orange-demo-multi-service/application/stats/stats-api/stats-api.iml
@@ -65,20 +65,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/orange-demo-multi-service/application/stats/stats-service/pom.xml b/orange-demo-multi-service/application/stats/stats-service/pom.xml
index 6d20bd6c..16e1255d 100644
--- a/orange-demo-multi-service/application/stats/stats-service/pom.xml
+++ b/orange-demo-multi-service/application/stats/stats-service/pom.xml
@@ -25,6 +25,11 @@
course-class-api
1.0.0
+
+ com.orange.demo
+ common-log
+ 1.0.0
+
com.orange.demo
common-redis
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
index a4853d5d..732c3025 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
import javax.sql.DataSource;
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
index d2a2e0e9..295f2fb3 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.CourseTransStatsVo;
import com.orange.demo.courseclassapi.vo.CourseVo;
import com.orange.demo.courseclassapi.client.CourseClient;
@@ -13,6 +12,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -24,79 +24,81 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_course_trans_stats")
+@Table(name = "zz_course_trans_stats")
public class CourseTransStats {
/**
* 主键Id。
*/
- @TableId(value = "stats_id", type = IdType.AUTO)
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "stats_id")
private Long statsId;
/**
* 统计日期。
*/
- @TableField(value = "stats_date")
+ @Column(name = "stats_date")
private Date statsDate;
/**
* 科目Id。
*/
- @TableField(value = "subject_id")
+ @Column(name = "subject_id")
private Integer subjectId;
/**
* 年级Id。
*/
- @TableField(value = "grade_id")
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 年级名称。
*/
- @TableField(value = "grade_name")
+ @Column(name = "grade_name")
private String gradeName;
/**
* 课程Id。
*/
- @TableField(value = "course_id")
+ @Column(name = "course_id")
private Long courseId;
/**
* 课程名称。
*/
- @TableField(value = "course_name")
+ @Column(name = "course_name")
private String courseName;
/**
* 学生上课次数。
*/
- @TableField(value = "student_attend_count")
+ @Column(name = "student_attend_count")
private Integer studentAttendCount;
/**
* 学生献花数量。
*/
- @TableField(value = "student_flower_amount")
+ @Column(name = "student_flower_amount")
private Integer studentFlowerAmount;
/**
* 学生献花次数。
*/
- @TableField(value = "student_flower_count")
+ @Column(name = "student_flower_count")
private Integer studentFlowerCount;
/**
* statsDate 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String statsDateStart;
/**
* statsDate 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String statsDateEnd;
@RelationDict(
@@ -105,7 +107,7 @@ public class CourseTransStats {
slaveModelClass = GradeVo.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
- @TableField(exist = false)
+ @Transient
private Map gradeIdDictMap;
@RelationDict(
@@ -114,13 +116,13 @@ public class CourseTransStats {
slaveModelClass = CourseVo.class,
slaveIdField = "courseId",
slaveNameField = "courseName")
- @TableField(exist = false)
+ @Transient
private Map courseIdDictMap;
@RelationConstDict(
masterIdField = "subjectId",
constantDictClass = Subject.class)
- @TableField(exist = false)
+ @Transient
private Map subjectIdDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
index 08568fb9..8b0083b0 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
@@ -1,7 +1,8 @@
package com.orange.demo.statsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
+import javax.persistence.*;
/**
* Grade实体对象。
@@ -10,24 +11,26 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_grade")
+@Table(name = "zz_grade")
public class Grade {
/**
* 主键Id。
*/
- @TableId(value = "grade_id", type = IdType.AUTO)
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 年级名称。
*/
- @TableField(value = "grade_name")
+ @Column(name = "grade_name")
private String gradeName;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
+ @DeletedFlagColumn
private Integer status;
}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
index e6a9d2e6..b9121404 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
@@ -1,7 +1,7 @@
package com.orange.demo.statsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
/**
* SchoolInfo实体对象。
@@ -10,30 +10,31 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_school_info")
+@Table(name = "zz_school_info")
public class SchoolInfo {
/**
* 学校Id。
*/
- @TableId(value = "school_id")
+ @Id
+ @Column(name = "school_id")
private Long schoolId;
/**
* 学校名称。
*/
- @TableField(value = "school_name")
+ @Column(name = "school_name")
private String schoolName;
/**
* 所在省Id。
*/
- @TableField(value = "province_id")
+ @Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
- @TableField(value = "city_id")
+ @Column(name = "city_id")
private Long cityId;
}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
index a9b71999..495f630a 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.StudentActionStatsVo;
import com.orange.demo.courseclassapi.vo.AreaCodeVo;
import com.orange.demo.courseclassapi.vo.GradeVo;
@@ -11,6 +10,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -22,145 +22,146 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_student_action_stats")
+@Table(name = "zz_student_action_stats")
public class StudentActionStats {
/**
* 主键Id。
*/
- @TableId(value = "stats_id")
+ @Id
+ @Column(name = "stats_id")
private Long statsId;
/**
* 统计日期。
*/
- @TableField(value = "stats_date")
+ @Column(name = "stats_date")
private Date statsDate;
/**
* 统计小时。
*/
- @TableField(value = "stats_month")
+ @Column(name = "stats_month")
private Date statsMonth;
/**
* 年级Id。
*/
- @TableField(value = "grade_id")
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 学生所在省Id。
*/
- @TableField(value = "province_id")
+ @Column(name = "province_id")
private Long provinceId;
/**
* 学生所在城市Id。
*/
- @TableField(value = "city_id")
+ @Column(name = "city_id")
private Long cityId;
/**
* 购课学币数量。
*/
- @TableField(value = "buy_course_amount")
+ @Column(name = "buy_course_amount")
private Integer buyCourseAmount;
/**
* 购买课程次数。
*/
- @TableField(value = "buy_course_count")
+ @Column(name = "buy_course_count")
private Integer buyCourseCount;
/**
* 购买视频学币数量。
*/
- @TableField(value = "buy_video_amount")
+ @Column(name = "buy_video_amount")
private Integer buyVideoAmount;
/**
* 购买视频次数。
*/
- @TableField(value = "buy_video_count")
+ @Column(name = "buy_video_count")
private Integer buyVideoCount;
/**
* 购买作业学币数量。
*/
- @TableField(value = "buy_paper_amount")
+ @Column(name = "buy_paper_amount")
private Integer buyPaperAmount;
/**
* 购买作业次数。
*/
- @TableField(value = "buy_paper_count")
+ @Column(name = "buy_paper_count")
private Integer buyPaperCount;
/**
* 购买献花数量。
*/
- @TableField(value = "buy_flower_amount")
+ @Column(name = "buy_flower_amount")
private Integer buyFlowerAmount;
/**
* 购买献花次数。
*/
- @TableField(value = "buy_flower_count")
+ @Column(name = "buy_flower_count")
private Integer buyFlowerCount;
/**
* 充值学币数量。
*/
- @TableField(value = "recharge_coin_amount")
+ @Column(name = "recharge_coin_amount")
private Integer rechargeCoinAmount;
/**
* 充值学币次数。
*/
- @TableField(value = "recharge_coin_count")
+ @Column(name = "recharge_coin_count")
private Integer rechargeCoinCount;
/**
* 线下课程上课次数。
*/
- @TableField(value = "do_course_count")
+ @Column(name = "do_course_count")
private Integer doCourseCount;
/**
* 观看视频次数。
*/
- @TableField(value = "watch_video_count")
+ @Column(name = "watch_video_count")
private Integer watchVideoCount;
/**
* 购买献花消费学币数量。
*/
- @TableField(value = "watch_video_total_second")
+ @Column(name = "watch_video_total_second")
private Integer watchVideoTotalSecond;
/**
* 做题数量。
*/
- @TableField(value = "do_exercise_count")
+ @Column(name = "do_exercise_count")
private Integer doExerciseCount;
/**
* 做题正确的数量。
*/
- @TableField(value = "do_exercise_correct_count")
+ @Column(name = "do_exercise_correct_count")
private Integer doExerciseCorrectCount;
/**
* statsDate 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String statsDateStart;
/**
* statsDate 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String statsDateEnd;
@RelationDict(
@@ -169,7 +170,7 @@ public class StudentActionStats {
slaveModelClass = GradeVo.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
- @TableField(exist = false)
+ @Transient
private Map gradeIdDictMap;
@RelationDict(
@@ -178,7 +179,7 @@ public class StudentActionStats {
slaveModelClass = AreaCodeVo.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map provinceIdDictMap;
@RelationDict(
@@ -187,7 +188,7 @@ public class StudentActionStats {
slaveModelClass = AreaCodeVo.class,
slaveIdField = "areaId",
slaveNameField = "areaName")
- @TableField(exist = false)
+ @Transient
private Map cityIdDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
index c0c3bc48..b7e24f52 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.statsapi.vo.StudentActionTransVo;
import com.orange.demo.courseclassapi.client.SchoolInfoClient;
import com.orange.demo.courseclassapi.vo.SchoolInfoVo;
@@ -14,6 +13,7 @@ import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Date;
import java.util.Map;
@@ -25,109 +25,110 @@ import java.util.Map;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_student_action_trans")
+@Table(name = "zz_student_action_trans")
public class StudentActionTrans {
/**
* 主键Id。
*/
- @TableId(value = "trans_id")
+ @Id
+ @Column(name = "trans_id")
private Long transId;
/**
* 学生Id。
*/
- @TableField(value = "student_id")
+ @Column(name = "student_id")
private Long studentId;
/**
* 学生名称。
*/
- @TableField(value = "student_name")
+ @Column(name = "student_name")
private String studentName;
/**
* 学生校区。
*/
- @TableField(value = "school_id")
+ @Column(name = "school_id")
private Long schoolId;
/**
* 年级Id。
*/
- @TableField(value = "grade_id")
+ @Column(name = "grade_id")
private Integer gradeId;
/**
* 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
*/
- @TableField(value = "action_type")
+ @Column(name = "action_type")
private Integer actionType;
/**
* 设备类型(0: iOS 1: Android 2: PC)。
*/
- @TableField(value = "device_type")
+ @Column(name = "device_type")
private Integer deviceType;
/**
* 看视频秒数。
*/
- @TableField(value = "watch_video_seconds")
+ @Column(name = "watch_video_seconds")
private Integer watchVideoSeconds;
/**
* 购买献花数量。
*/
- @TableField(value = "flower_count")
+ @Column(name = "flower_count")
private Integer flowerCount;
/**
* 购买作业数量。
*/
- @TableField(value = "paper_count")
+ @Column(name = "paper_count")
private Integer paperCount;
/**
* 购买视频数量。
*/
- @TableField(value = "video_count")
+ @Column(name = "video_count")
private Integer videoCount;
/**
* 购买课程数量。
*/
- @TableField(value = "course_count")
+ @Column(name = "course_count")
private Integer courseCount;
/**
* 充值学币数量。
*/
- @TableField(value = "coin_count")
+ @Column(name = "coin_count")
private Integer coinCount;
/**
* 做题是否正确标记。
*/
- @TableField(value = "exercise_correct_flag")
+ @Column(name = "exercise_correct_flag")
private Integer exerciseCorrectFlag;
/**
* 发生时间。
*/
- @TableField(value = "create_time")
+ @Column(name = "create_time")
private Date createTime;
/**
* createTime 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String createTimeEnd;
@RelationDict(
@@ -136,7 +137,7 @@ public class StudentActionTrans {
slaveModelClass = SchoolInfoVo.class,
slaveIdField = "schoolId",
slaveNameField = "schoolName")
- @TableField(exist = false)
+ @Transient
private Map schoolIdDictMap;
@RelationDict(
@@ -145,19 +146,19 @@ public class StudentActionTrans {
slaveModelClass = GradeVo.class,
slaveIdField = "gradeId",
slaveNameField = "gradeName")
- @TableField(exist = false)
+ @Transient
private Map gradeIdDictMap;
@RelationConstDict(
masterIdField = "actionType",
constantDictClass = StudentActionType.class)
- @TableField(exist = false)
+ @Transient
private Map actionTypeDictMap;
@RelationConstDict(
masterIdField = "deviceType",
constantDictClass = DeviceType.class)
- @TableField(exist = false)
+ @Transient
private Map deviceTypeDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java
index 3970b620..13b86d6a 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/impl/StudentActionTransServiceImpl.java
@@ -1,6 +1,5 @@
package com.orange.demo.statsservice.service.impl;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.statsservice.service.*;
import com.orange.demo.statsservice.dao.*;
import com.orange.demo.statsservice.model.*;
@@ -76,8 +75,7 @@ public class StudentActionTransServiceImpl extends BaseService uw = this.createUpdateQueryForNullValue(studentActionTrans, studentActionTrans.getTransId());
- return studentActionTransMapper.update(studentActionTrans, uw) == 1;
+ return studentActionTransMapper.updateByPrimaryKey(studentActionTrans) == 1;
}
/**
@@ -89,7 +87,8 @@ public class StudentActionTransServiceImpl extends BaseService
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -100,6 +103,7 @@
+
diff --git a/orange-demo-multi-service/application/upms/upms-api/upms-api.iml b/orange-demo-multi-service/application/upms/upms-api/upms-api.iml
index b8fdc3c9..d15955ea 100644
--- a/orange-demo-multi-service/application/upms/upms-api/upms-api.iml
+++ b/orange-demo-multi-service/application/upms/upms-api/upms-api.iml
@@ -64,20 +64,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/orange-demo-multi-service/application/upms/upms-service/pom.xml b/orange-demo-multi-service/application/upms/upms-service/pom.xml
index 4af91972..3980995a 100644
--- a/orange-demo-multi-service/application/upms/upms-service/pom.xml
+++ b/orange-demo-multi-service/application/upms/upms-service/pom.xml
@@ -20,6 +20,11 @@
upms-api
1.0.0
+
+ com.orange.demo
+ common-log
+ 1.0.0
+
com.orange.demo
common-redis
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
index fe6f4bc1..a9fa481c 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
import javax.sql.DataSource;
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
index 478b1a8d..5b260e9a 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
@@ -14,8 +14,7 @@ import com.orange.demo.common.core.util.*;
import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.upmsapi.constant.SysUserStatus;
import com.orange.demo.upmsapi.constant.SysUserType;
-import com.orange.demo.upmsservice.model.SysMenu;
-import com.orange.demo.upmsservice.model.SysUser;
+import com.orange.demo.upmsservice.model.*;
import com.orange.demo.upmsservice.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -165,9 +164,10 @@ public class LoginController {
}
private JSONObject buildLoginData(SysUser user) {
+ int deviceType = MyCommonUtil.getDeviceType();
boolean isAdmin = user.getUserType() == SysUserType.TYPE_ADMIN;
TokenData tokenData = new TokenData();
- String sessionId = user.getLoginName() + "_" + MyCommonUtil.generateUuid();
+ String sessionId = user.getLoginName() + "_" + deviceType + "_" + MyCommonUtil.generateUuid();
tokenData.setUserId(user.getUserId());
tokenData.setIsAdmin(isAdmin);
tokenData.setLoginName(user.getLoginName());
@@ -175,6 +175,7 @@ public class LoginController {
tokenData.setSessionId(sessionId);
tokenData.setLoginIp(IpUtil.getRemoteIpAddress(ContextUtil.getHttpRequest()));
tokenData.setLoginTime(new Date());
+ tokenData.setDeviceType(deviceType);
// 这里手动将TokenData存入request，便于OperationLogAspect统一处理操作日志。
TokenData.addToRequest(tokenData);
JSONObject jsonData = new JSONObject();
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
index 9894560b..56904d7c 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
@@ -1,5 +1,6 @@
package com.orange.demo.upmsservice.controller;
+import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.upmsservice.model.*;
import com.orange.demo.upmsservice.service.*;
@@ -52,7 +53,6 @@ public class SysUserController extends BaseController
* @param roleIdListString 逗号分隔的角色Id列表。
* @return 应答结果对象，包含新增用户的主键Id。
*/
- @SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {
"sysUserDto.userId",
"sysUserDto.createTimeStart",
@@ -65,11 +65,12 @@ public class SysUserController extends BaseController
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
SysUser sysUser = MyModelUtil.copyTo(sysUserDto, SysUser.class);
- CallResult result = sysUserService.verifyRelatedData(sysUser, null, roleIdListString);
+ CallResult result = sysUserService.verifyRelatedData(
+ sysUser, null, roleIdListString);
if (!result.isSuccess()) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
}
- Set roleIdSet = (Set) result.getData().get("roleIdSet");
+ Set roleIdSet = result.getData().getObject("roleIdSet", new TypeReference>() {});
sysUserService.saveNew(sysUser, roleIdSet);
return ResponseResult.success(sysUser.getUserId());
}
@@ -81,7 +82,6 @@ public class SysUserController extends BaseController
* @param roleIdListString 逗号分隔的角色Id列表。
* @return 应答结果对象。
*/
- @SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {
"sysUserDto.createTimeStart",
"sysUserDto.createTimeEnd"})
@@ -97,11 +97,12 @@ public class SysUserController extends BaseController
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
SysUser sysUser = MyModelUtil.copyTo(sysUserDto, SysUser.class);
- CallResult result = sysUserService.verifyRelatedData(sysUser, originalUser, roleIdListString);
+ CallResult result = sysUserService.verifyRelatedData(
+ sysUser, originalUser, roleIdListString);
if (!result.isSuccess()) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
}
- Set roleIdSet = (Set) result.getData().get("roleIdSet");
+ Set roleIdSet = result.getData().getObject("roleIdSet", new TypeReference>() {});
if (!sysUserService.update(sysUser, originalUser, roleIdSet)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
index 38e45079..47f8606b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
@@ -1,6 +1,6 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,6 +11,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.*;
/**
@@ -21,55 +22,56 @@ import java.util.*;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_menu")
+@Table(name = "zz_sys_menu")
public class SysMenu extends BaseModel {
/**
* 主键Id。
*/
- @TableId(value = "menu_id")
+ @Id
+ @Column(name = "menu_id")
private Long menuId;
/**
* 父菜单Id，目录菜单的父菜单为null。
*/
- @TableField(value = "parent_id")
+ @Column(name = "parent_id")
private Long parentId;
/**
* 菜单显示名称。
*/
- @TableField(value = "menu_name")
+ @Column(name = "menu_name")
private String menuName;
/**
* 菜单类型(0: 目录 1: 菜单 2: 按钮 3: UI片段)。
*/
- @TableField(value = "menu_type")
+ @Column(name = "menu_type")
private Integer menuType;
/**
* 前端表单路由名称，仅用于menu_type为1的菜单类型。
*/
- @TableField(value = "form_router_name")
+ @Column(name = "form_router_name")
private String formRouterName;
/**
* 在线表单主键Id，仅用于在线表单绑定的菜单。
*/
- @TableField(value = "online_form_id")
+ @Column(name = "online_form_id")
private Long onlineFormId;
/**
* 在线表单菜单的权限控制类型，具体值可参考SysOnlineMenuPermType常量对象。
*/
- @TableField(value = "online_menu_perm_type")
+ @Column(name = "online_menu_perm_type")
private Integer onlineMenuPermType;
/**
* 菜单显示顺序 (值越小，排序越靠前)。
*/
- @TableField(value = "show_order")
+ @Column(name = "show_order")
private Integer showOrder;
/**
@@ -80,15 +82,15 @@ public class SysMenu extends BaseModel {
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysMenuPermCodeMapper",
relationMasterIdField = "menuId",
relationModelClass = SysMenuPermCode.class)
- @TableField(exist = false)
+ @Transient
private List sysMenuPermCodeList;
@Mapper
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
index 816f5ab8..d8a1c65b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 菜单与权限字关联实体对象。
*
@@ -10,18 +11,20 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_sys_menu_perm_code")
+@Table(name = "zz_sys_menu_perm_code")
public class SysMenuPermCode {
/**
* 关联菜单Id。
*/
- @TableField(value = "menu_id")
+ @Id
+ @Column(name = "menu_id")
private Long menuId;
/**
* 关联权限字Id。
*/
- @TableField(value = "perm_code_id")
+ @Id
+ @Column(name = "perm_code_id")
private Long permCodeId;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
index d6cfa362..be4d9ff9 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
@@ -1,11 +1,12 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.annotation.RelationDict;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.*;
import java.util.*;
/**
@@ -16,25 +17,26 @@ import java.util.*;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_perm")
+@Table(name = "zz_sys_perm")
public class SysPerm extends BaseModel {
/**
* 权限Id。
*/
- @TableId(value = "perm_id")
+ @Id
+ @Column(name = "perm_id")
private Long permId;
/**
* 权限所在的权限模块Id。
*/
- @TableField(value = "module_id")
+ @Column(name = "module_id")
private Long moduleId;
/**
* 权限名称。
*/
- @TableField(value = "perm_name")
+ @Column(name = "perm_name")
private String permName;
/**
@@ -45,14 +47,14 @@ public class SysPerm extends BaseModel {
/**
* 权限在当前模块下的顺序，由小到大。
*/
- @TableField(value = "show_order")
+ @Column(name = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
@RelationDict(
@@ -61,6 +63,6 @@ public class SysPerm extends BaseModel {
slaveModelClass = SysPermModule.class,
slaveIdField = "moduleId",
slaveNameField = "moduleName")
- @TableField(exist = false)
+ @Transient
private Map moduleIdDictMap;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
index 63095b68..a3cebb9f 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
@@ -1,6 +1,6 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,6 +11,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.*;
/**
@@ -21,57 +22,58 @@ import java.util.*;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_perm_code")
+@Table(name = "zz_sys_perm_code")
public class SysPermCode extends BaseModel {
/**
* 主键Id。
*/
- @TableId(value = "perm_code_id")
+ @Id
+ @Column(name = "perm_code_id")
private Long permCodeId;
/**
* 上级权限字Id。
*/
- @TableField(value = "parent_id")
+ @Column(name = "parent_id")
private Long parentId;
/**
* 权限字标识(一般为有含义的英文字符串)。
*/
- @TableField(value = "perm_code")
+ @Column(name = "perm_code")
private String permCode;
/**
* 权限类型(0: 表单 1: UI片段 2: 操作)。
*/
- @TableField(value = "perm_code_type")
+ @Column(name = "perm_code_type")
private Integer permCodeType;
/**
* 显示名称。
*/
- @TableField(value = "show_name")
+ @Column(name = "show_name")
private String showName;
/**
* 显示顺序(数值越小，越靠前)。
*/
- @TableField(value = "show_order")
+ @Column(name = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysPermCodePermMapper",
relationMasterIdField = "permCodeId",
relationModelClass = SysPermCodePerm.class)
- @TableField(exist = false)
+ @Transient
private List sysPermCodePermList;
@Mapper
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
index 7416c102..3af23547 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 权限字与权限资源关联实体对象。
*
@@ -10,18 +11,20 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_sys_perm_code_perm")
+@Table(name = "zz_sys_perm_code_perm")
public class SysPermCodePerm {
/**
* 权限字Id。
*/
- @TableField(value = "perm_code_id")
+ @Id
+ @Column(name = "perm_code_id")
private Long permCodeId;
/**
* 权限Id。
*/
- @TableField(value = "perm_id")
+ @Id
+ @Column(name = "perm_id")
private Long permId;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
index f36184cb..7a4fd99d 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
@@ -1,10 +1,11 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.base.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.*;
import java.util.*;
/**
@@ -15,46 +16,47 @@ import java.util.*;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_perm_module")
+@Table(name = "zz_sys_perm_module")
public class SysPermModule extends BaseModel {
/**
* 权限模块Id。
*/
- @TableId(value = "module_id")
+ @Id
+ @Column(name = "module_id")
private Long moduleId;
/**
* 上级权限模块Id。
*/
- @TableField(value = "parent_id")
+ @Column(name = "parent_id")
private Long parentId;
/**
* 权限模块名称。
*/
- @TableField(value = "module_name")
+ @Column(name = "module_name")
private String moduleName;
/**
* 权限模块类型(0: 普通模块 1: Controller模块)。
*/
- @TableField(value = "module_type")
+ @Column(name = "module_type")
private Integer moduleType;
/**
* 权限模块在当前层级下的顺序，由小到大。
*/
- @TableField(value = "show_order")
+ @Column(name = "show_order")
private Integer showOrder;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
- @TableField(exist = false)
+ @Transient
private List sysPermList;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
index a599e996..0b961e39 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 白名单实体对象。
*
@@ -10,24 +11,25 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_sys_perm_whitelist")
+@Table(name = "zz_sys_perm_whitelist")
public class SysPermWhitelist {
/**
* 权限资源的URL。
*/
- @TableId(value = "perm_url")
+ @Id
+ @Column(name = "perm_url")
private String permUrl;
/**
* 权限资源所属模块名字(通常是Controller的名字)。
*/
- @TableField(value = "module_name")
+ @Column(name = "module_name")
private String moduleName;
/**
* 权限的名称。
*/
- @TableField(value = "perm_name")
+ @Column(name = "perm_name")
private String permName;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
index e608c662..7ea2d4b6 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
@@ -1,6 +1,6 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -11,6 +11,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.*;
/**
@@ -21,33 +22,34 @@ import java.util.*;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_role")
+@Table(name = "zz_sys_role")
public class SysRole extends BaseModel {
/**
* 主键Id。
*/
- @TableId(value = "role_id")
+ @Id
+ @Column(name = "role_id")
private Long roleId;
/**
* 角色名称。
*/
- @TableField(value = "role_name")
+ @Column(name = "role_name")
private String roleName;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
@RelationManyToMany(
relationMapperName = "sysRoleMenuMapper",
relationMasterIdField = "roleId",
relationModelClass = SysRoleMenu.class)
- @TableField(exist = false)
+ @Transient
private List sysRoleMenuList;
@Mapper
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
index 0363a047..c8574214 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 角色菜单实体对象。
*
@@ -10,18 +11,20 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_sys_role_menu")
+@Table(name = "zz_sys_role_menu")
public class SysRoleMenu {
/**
* 角色Id。
*/
- @TableField(value = "role_id")
+ @Id
+ @Column(name = "role_id")
private Long roleId;
/**
* 菜单Id。
*/
- @TableField(value = "menu_id")
+ @Id
+ @Column(name = "menu_id")
private Long menuId;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
index 901f181c..ea3b81a6 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
@@ -1,6 +1,5 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.upmsapi.vo.SysUserVo;
import com.orange.demo.upmsapi.constant.SysUserType;
import com.orange.demo.upmsapi.constant.SysUserStatus;
@@ -8,10 +7,12 @@ import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.annotation.RelationManyToMany;
import com.orange.demo.common.core.base.model.BaseModel;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
+import javax.persistence.*;
import java.util.Map;
import java.util.List;
@@ -24,19 +25,20 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "zz_sys_user")
+@Table(name = "zz_sys_user")
public class SysUser extends BaseModel {
/**
* 用户Id。
*/
- @TableId(value = "user_id")
+ @Id
+ @Column(name = "user_id")
private Long userId;
/**
* 登录用户名。
*/
- @TableField(value = "login_name")
+ @Column(name = "login_name")
private String loginName;
/**
@@ -47,44 +49,44 @@ public class SysUser extends BaseModel {
/**
* 用户显示名称。
*/
- @TableField(value = "show_name")
+ @Column(name = "show_name")
private String showName;
/**
* 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
*/
- @TableField(value = "user_type")
+ @Column(name = "user_type")
private Integer userType;
/**
* 用户头像的Url。
*/
- @TableField(value = "head_image_url")
+ @Column(name = "head_image_url")
private String headImageUrl;
/**
* 用户状态(0: 正常 1: 锁定)。
*/
- @TableField(value = "user_status")
+ @Column(name = "user_status")
private Integer userStatus;
/**
* 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @TableLogic
- @TableField(value = "deleted_flag")
+ @DeletedFlagColumn
+ @Column(name = "deleted_flag")
private Integer deletedFlag;
/**
* createTime 范围过滤起始值(>=)。
*/
- @TableField(exist = false)
+ @Transient
private String createTimeStart;
/**
* createTime 范围过滤结束值(<=)。
*/
- @TableField(exist = false)
+ @Transient
private String createTimeEnd;
/**
@@ -94,19 +96,19 @@ public class SysUser extends BaseModel {
relationMapperName = "sysUserRoleMapper",
relationMasterIdField = "userId",
relationModelClass = SysUserRole.class)
- @TableField(exist = false)
+ @Transient
private List sysUserRoleList;
@RelationConstDict(
masterIdField = "userType",
constantDictClass = SysUserType.class)
- @TableField(exist = false)
+ @Transient
private Map userTypeDictMap;
@RelationConstDict(
masterIdField = "userStatus",
constantDictClass = SysUserStatus.class)
- @TableField(exist = false)
+ @Transient
private Map userStatusDictMap;
@Mapper
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
index e2b552c4..a521ea7e 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
@@ -1,8 +1,9 @@
package com.orange.demo.upmsservice.model;
-import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import javax.persistence.*;
+
/**
* 用户角色实体对象。
*
@@ -10,18 +11,20 @@ import lombok.Data;
* @date 2020-08-08
*/
@Data
-@TableName(value = "zz_sys_user_role")
+@Table(name = "zz_sys_user_role")
public class SysUserRole {
/**
* 用户Id。
*/
- @TableField(value = "user_id")
+ @Id
+ @Column(name = "user_id")
private Long userId;
/**
* 角色Id。
*/
- @TableField(value = "role_id")
+ @Id
+ @Column(name = "role_id")
private Long roleId;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
index a8cf015c..df36df8b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
@@ -154,10 +154,10 @@ public interface SysUserService extends IBaseService {
/**
* 验证用户对象关联的数据是否都合法。
*
- * @param sysUser 当前操作的对象。
- * @param originalSysUser 原有对象。
- * @param roleIdListString 逗号分隔的角色Id列表字符串。
+ * @param sysUser 当前操作的对象。
+ * @param originalSysUser 原有对象。
+ * @param roleIds 逗号分隔的角色Id列表字符串。
* @return 验证结果。
*/
- CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIdListString);
+ CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIds);
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java
index bd9cfe6e..e840f30e 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java
@@ -2,9 +2,6 @@ package com.orange.demo.upmsservice.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -26,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import java.util.*;
import java.util.stream.Collectors;
@@ -76,12 +74,14 @@ public class SysMenuServiceImpl extends BaseService implements Sy
MyModelUtil.fillCommonsForInsert(sysMenu);
sysMenuMapper.insert(sysMenu);
if (permCodeIdSet != null) {
+ List sysMenuPermCodeList = new LinkedList<>();
for (Long permCodeId : permCodeIdSet) {
SysMenuPermCode menuPermCode = new SysMenuPermCode();
menuPermCode.setMenuId(sysMenu.getMenuId());
menuPermCode.setPermCodeId(permCodeId);
- sysMenuPermCodeMapper.insert(menuPermCode);
+ sysMenuPermCodeList.add(menuPermCode);
}
+ sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
}
// 判断当前菜单是否为指向在线表单的菜单，并将根据约定，动态插入两个子菜单。
if (sysMenu.getOnlineFormId() != null) {
@@ -124,27 +124,30 @@ public class SysMenuServiceImpl extends BaseService implements Sy
public boolean update(SysMenu sysMenu, SysMenu originalSysMenu, Set permCodeIdSet) {
MyModelUtil.fillCommonsForUpdate(sysMenu, originalSysMenu);
sysMenu.setMenuType(originalSysMenu.getMenuType());
- UpdateWrapper uw = this.createUpdateQueryForNullValue(sysMenu, sysMenu.getMenuId());
- if (sysMenuMapper.update(sysMenu, uw) != 1) {
+ sysMenu.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+ if (sysMenuMapper.updateByPrimaryKey(sysMenu) != 1) {
return false;
}
SysMenuPermCode deletedMenuPermCode = new SysMenuPermCode();
deletedMenuPermCode.setMenuId(sysMenu.getMenuId());
- sysMenuPermCodeMapper.delete(new QueryWrapper<>(deletedMenuPermCode));
+ sysMenuPermCodeMapper.delete(deletedMenuPermCode);
if (permCodeIdSet != null) {
+ List sysMenuPermCodeList = new LinkedList<>();
for (Long permCodeId : permCodeIdSet) {
SysMenuPermCode menuPermCode = new SysMenuPermCode();
menuPermCode.setMenuId(sysMenu.getMenuId());
menuPermCode.setPermCodeId(permCodeId);
- sysMenuPermCodeMapper.insert(menuPermCode);
+ sysMenuPermCodeList.add(menuPermCode);
}
+ sysMenuPermCodeMapper.insertList(sysMenuPermCodeList);
}
// 如果当前菜单的在线表单Id变化了，就需要同步更新他的内置子菜单也同步更新。
if (ObjectUtil.notEqual(originalSysMenu.getOnlineFormId(), sysMenu.getOnlineFormId())) {
SysMenu onlineSubMenu = new SysMenu();
onlineSubMenu.setOnlineFormId(sysMenu.getOnlineFormId());
- sysMenuMapper.update(onlineSubMenu,
- new QueryWrapper().lambda().eq(SysMenu::getParentId, sysMenu.getMenuId()));
+ Example e = new Example(SysMenu.class);
+ e.createCriteria().andEqualTo("parentId", sysMenu.getMenuId());
+ sysMenuMapper.updateByExampleSelective(onlineSubMenu, e);
}
return true;
}
@@ -159,18 +162,23 @@ public class SysMenuServiceImpl extends BaseService implements Sy
@Override
public boolean remove(SysMenu menu) {
Long menuId = menu.getMenuId();
- if (sysMenuMapper.deleteById(menuId) != 1) {
+ if (!this.removeById(menuId)) {
return false;
}
SysRoleMenu roleMenu = new SysRoleMenu();
roleMenu.setMenuId(menuId);
- sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
+ sysRoleMenuMapper.delete(roleMenu);
SysMenuPermCode menuPermCode = new SysMenuPermCode();
menuPermCode.setMenuId(menuId);
- sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
+ sysMenuPermCodeMapper.delete(menuPermCode);
// 如果为指向在线表单的菜单，则连同删除子菜单
if (menu.getOnlineFormId() != null) {
- sysMenuMapper.delete(new QueryWrapper().lambda().eq(SysMenu::getParentId, menuId));
+ Example e = new Example(SysMenu.class);
+ Example.Criteria c = e.createCriteria().andEqualTo("parentId", menuId);
+ c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+ SysMenu deletedSubMenu = new SysMenu();
+ deletedSubMenu.setDeletedFlag(GlobalDeletedFlag.DELETED);
+ sysMenuMapper.updateByExampleSelective(deletedSubMenu, e);
}
return true;
}
@@ -182,11 +190,12 @@ public class SysMenuServiceImpl extends BaseService implements Sy
*/
@Override
public Collection getAllMenuList() {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
- queryWrapper.in(this.safeMapToColumnName("menuType"),
- Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
- return sysMenuMapper.selectList(queryWrapper);
+ Example e = new Example(SysMenu.class);
+ e.orderBy("showOrder");
+ Example.Criteria c = e.createCriteria();
+ c.andIn("menuType", Arrays.asList(SysMenuType.TYPE_MENU, SysMenuType.TYPE_DIRECTORY));
+ c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+ return sysMenuMapper.selectByExample(e);
}
/**
@@ -285,12 +294,12 @@ public class SysMenuServiceImpl extends BaseService implements Sy
*/
@Override
public List getAllOnlineMenuList(Integer menuType) {
- LambdaQueryWrapper queryWrapper =
- new QueryWrapper().lambda().isNotNull(SysMenu::getOnlineFormId);
+ Example e = new Example(SysMenu.class);
+ Example.Criteria c = e.createCriteria().andIsNotNull("onlineFormId");
if (menuType != null) {
- queryWrapper.eq(SysMenu::getMenuType, menuType);
+ c.andEqualTo("menuType", menuType);
}
- return sysMenuMapper.selectList(queryWrapper);
+ return sysMenuMapper.selectByExample(e);
}
/**
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java
index 5aacae1e..db1a668b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermCodeServiceImpl.java
@@ -1,8 +1,6 @@
package com.orange.demo.upmsservice.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
@@ -95,12 +93,14 @@ public class SysPermCodeServiceImpl extends BaseService imple
MyModelUtil.fillCommonsForInsert(sysPermCode);
sysPermCodeMapper.insert(sysPermCode);
if (permIdSet != null) {
+ List sysPermCodePermList = new LinkedList<>();
for (Long permId : permIdSet) {
SysPermCodePerm permCodePerm = new SysPermCodePerm();
permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
permCodePerm.setPermId(permId);
- sysPermCodePermMapper.insert(permCodePerm);
+ sysPermCodePermList.add(permCodePerm);
}
+ sysPermCodePermMapper.insertList(sysPermCodePermList);
}
return sysPermCode;
}
@@ -117,22 +117,23 @@ public class SysPermCodeServiceImpl extends BaseService imple
@Override
public boolean update(SysPermCode sysPermCode, SysPermCode originalSysPermCode, Set permIdSet) {
sysPermCode.setParentId(originalSysPermCode.getParentId());
+ sysPermCode.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForUpdate(sysPermCode, originalSysPermCode);
- UpdateWrapper uw =
- this.createUpdateQueryForNullValue(sysPermCode, sysPermCode.getPermCodeId());
- if (sysPermCodeMapper.update(sysPermCode, uw) != 1) {
+ if (sysPermCodeMapper.updateByPrimaryKey(sysPermCode) != 1) {
return false;
}
SysPermCodePerm deletedPermCodePerm = new SysPermCodePerm();
deletedPermCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
- sysPermCodePermMapper.delete(new QueryWrapper<>(deletedPermCodePerm));
+ sysPermCodePermMapper.delete(deletedPermCodePerm);
if (permIdSet != null) {
+ List sysPermCodePermList = new LinkedList<>();
for (Long permId : permIdSet) {
SysPermCodePerm permCodePerm = new SysPermCodePerm();
permCodePerm.setPermCodeId(sysPermCode.getPermCodeId());
permCodePerm.setPermId(permId);
- sysPermCodePermMapper.insert(permCodePerm);
+ sysPermCodePermList.add(permCodePerm);
}
+ sysPermCodePermMapper.insertList(sysPermCodePermList);
}
return true;
}
@@ -146,15 +147,15 @@ public class SysPermCodeServiceImpl extends BaseService imple
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long permCodeId) {
- if (sysPermCodeMapper.deleteById(permCodeId) != 1) {
+ if (!this.removeById(permCodeId)) {
return false;
}
SysMenuPermCode menuPermCode = new SysMenuPermCode();
menuPermCode.setPermCodeId(permCodeId);
- sysMenuPermCodeMapper.delete(new QueryWrapper<>(menuPermCode));
+ sysMenuPermCodeMapper.delete(menuPermCode);
SysPermCodePerm permCodePerm = new SysPermCodePerm();
permCodePerm.setPermCodeId(permCodeId);
- sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
+ sysPermCodePermMapper.delete(permCodePerm);
return true;
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermModuleServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermModuleServiceImpl.java
index 40983cb7..9d11f3ff 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermModuleServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermModuleServiceImpl.java
@@ -71,7 +71,8 @@ public class SysPermModuleServiceImpl extends BaseService i
@Override
public boolean update(SysPermModule sysPermModule, SysPermModule originalSysPermModule) {
MyModelUtil.fillCommonsForUpdate(sysPermModule, originalSysPermModule);
- return sysPermModuleMapper.updateById(sysPermModule) != 0;
+ sysPermModule.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+ return sysPermModuleMapper.updateByPrimaryKey(sysPermModule) != 0;
}
/**
@@ -83,7 +84,7 @@ public class SysPermModuleServiceImpl extends BaseService i
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long moduleId) {
- return sysPermModuleMapper.deleteById(moduleId) == 1;
+ return this.removeById(moduleId);
}
/**
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java
index 591d7edf..2144cc6b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysPermServiceImpl.java
@@ -1,6 +1,5 @@
package com.orange.demo.upmsservice.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;
@@ -19,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import java.util.*;
@@ -78,7 +78,8 @@ public class SysPermServiceImpl extends BaseService implements Sy
@Override
public boolean update(SysPerm perm, SysPerm originalPerm) {
MyModelUtil.fillCommonsForUpdate(perm, originalPerm);
- return sysPermMapper.updateById(perm) != 0;
+ perm.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+ return sysPermMapper.updateByPrimaryKeySelective(perm) != 0;
}
/**
@@ -90,12 +91,12 @@ public class SysPermServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long permId) {
- if (sysPermMapper.deleteById(permId) != 1) {
+ if (!this.removeById(permId)) {
return false;
}
SysPermCodePerm permCodePerm = new SysPermCodePerm();
permCodePerm.setPermId(permId);
- sysPermCodePermMapper.delete(new QueryWrapper<>(permCodePerm));
+ sysPermCodePermMapper.delete(permCodePerm);
return true;
}
@@ -107,13 +108,17 @@ public class SysPermServiceImpl extends BaseService implements Sy
*/
@Override
public List getPermListWithRelation(SysPerm sysPermFilter) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.orderByAsc(this.safeMapToColumnName("showOrder"));
- queryWrapper.eq(ObjectUtil.isNotNull(sysPermFilter.getModuleId()),
- this.safeMapToColumnName("moduleId"), sysPermFilter.getModuleId());
- queryWrapper.like(ObjectUtil.isNotNull(sysPermFilter.getUrl()),
- this.safeMapToColumnName("url"), "%" + sysPermFilter.getUrl() + "%");
- List permList = sysPermMapper.selectList(queryWrapper);
+ Example e = new Example(SysPerm.class);
+ e.orderBy("showOrder");
+ Example.Criteria c = e.createCriteria();
+ if (ObjectUtil.isNotNull(sysPermFilter.getModuleId())) {
+ c.andEqualTo("moduleId", sysPermFilter.getModuleId());
+ }
+ if (ObjectUtil.isNotNull(sysPermFilter.getUrl())) {
+ c.andLike("url", "%" + sysPermFilter.getUrl() + "%");
+ }
+ c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+ List permList = sysPermMapper.selectByExample(e);
// 这里因为权限只有字典数据，所以仅仅做字典关联。
this.buildRelationForDataList(permList, MyRelationParam.dictOnly());
return permList;
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java
index f9863996..d4beabcb 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysRoleServiceImpl.java
@@ -1,6 +1,5 @@
package com.orange.demo.upmsservice.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.base.dao.BaseDaoMapper;
@@ -71,12 +70,14 @@ public class SysRoleServiceImpl extends BaseService implements Sy
MyModelUtil.fillCommonsForInsert(role);
sysRoleMapper.insert(role);
if (menuIdSet != null) {
+ List roleMenuList = new LinkedList<>();
for (Long menuId : menuIdSet) {
SysRoleMenu roleMenu = new SysRoleMenu();
roleMenu.setRoleId(role.getRoleId());
roleMenu.setMenuId(menuId);
- sysRoleMenuMapper.insert(roleMenu);
+ roleMenuList.add(roleMenu);
}
+ sysRoleMenuMapper.insertList(roleMenuList);
}
return role;
}
@@ -92,20 +93,23 @@ public class SysRoleServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(SysRole role, SysRole originalRole, Set menuIdSet) {
+ role.setDeletedFlag(GlobalDeletedFlag.NORMAL);
MyModelUtil.fillCommonsForUpdate(role, originalRole);
- if (sysRoleMapper.updateById(role) != 1) {
+ if (sysRoleMapper.updateByPrimaryKey(role) != 1) {
return false;
}
SysRoleMenu deletedRoleMenu = new SysRoleMenu();
deletedRoleMenu.setRoleId(role.getRoleId());
- sysRoleMenuMapper.delete(new QueryWrapper<>(deletedRoleMenu));
+ sysRoleMenuMapper.delete(deletedRoleMenu);
if (menuIdSet != null) {
+ List roleMenuList = new LinkedList<>();
for (Long menuId : menuIdSet) {
SysRoleMenu roleMenu = new SysRoleMenu();
roleMenu.setRoleId(role.getRoleId());
roleMenu.setMenuId(menuId);
- sysRoleMenuMapper.insert(roleMenu);
+ roleMenuList.add(roleMenu);
}
+ sysRoleMenuMapper.insertList(roleMenuList);
}
return true;
}
@@ -119,15 +123,15 @@ public class SysRoleServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long roleId) {
- if (sysRoleMapper.deleteById(roleId) != 1) {
+ if (!this.removeById(roleId)) {
return false;
}
SysRoleMenu roleMenu = new SysRoleMenu();
roleMenu.setRoleId(roleId);
- sysRoleMenuMapper.delete(new QueryWrapper<>(roleMenu));
+ sysRoleMenuMapper.delete(roleMenu);
SysUserRole userRole = new SysUserRole();
userRole.setRoleId(roleId);
- sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
+ sysUserRoleMapper.delete(userRole);
return true;
}
@@ -151,9 +155,7 @@ public class SysRoleServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public void addUserRoleList(List userRoleList) {
- for (SysUserRole userRole : userRoleList) {
- sysUserRoleMapper.insert(userRole);
- }
+ sysUserRoleMapper.insertList(userRoleList);
}
/**
@@ -169,7 +171,7 @@ public class SysRoleServiceImpl extends BaseService implements Sy
SysUserRole userRole = new SysUserRole();
userRole.setRoleId(roleId);
userRole.setUserId(userId);
- return sysUserRoleMapper.delete(new QueryWrapper<>(userRole)) == 1;
+ return sysUserRoleMapper.delete(userRole) == 1;
}
/**
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
index f5a41499..43f06c7f 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
@@ -1,7 +1,5 @@
package com.orange.demo.upmsservice.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.upmsservice.service.*;
import com.orange.demo.upmsservice.dao.*;
@@ -21,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import java.util.*;
import java.util.stream.Collectors;
@@ -66,7 +65,8 @@ public class SysUserServiceImpl extends BaseService implements Sy
public SysUser getSysUserByLoginName(String loginName) {
SysUser filter = new SysUser();
filter.setLoginName(loginName);
- return sysUserMapper.selectOne(new QueryWrapper<>(filter));
+ filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+ return sysUserMapper.selectOne(filter);
}
/**
@@ -86,12 +86,14 @@ public class SysUserServiceImpl extends BaseService implements Sy
MyModelUtil.fillCommonsForInsert(user);
sysUserMapper.insert(user);
if (CollectionUtils.isNotEmpty(roleIdSet)) {
+ List userRoleList = new LinkedList<>();
for (Long roleId : roleIdSet) {
SysUserRole userRole = new SysUserRole();
userRole.setUserId(user.getUserId());
userRole.setRoleId(roleId);
- sysUserRoleMapper.insert(userRole);
+ userRoleList.add(userRole);
}
+ sysUserRoleMapper.insertList(userRoleList);
}
return user;
}
@@ -110,21 +112,23 @@ public class SysUserServiceImpl extends BaseService implements Sy
user.setLoginName(originalUser.getLoginName());
user.setPassword(originalUser.getPassword());
MyModelUtil.fillCommonsForUpdate(user, originalUser);
- UpdateWrapper uw = this.createUpdateQueryForNullValue(user, user.getUserId());
- if (sysUserMapper.update(user, uw) != 1) {
+ user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+ if (sysUserMapper.updateByPrimaryKey(user) != 1) {
return false;
}
// 先删除原有的User-Role关联关系，再重新插入新的关联关系
SysUserRole deletedUserRole = new SysUserRole();
deletedUserRole.setUserId(user.getUserId());
- sysUserRoleMapper.delete(new QueryWrapper<>(deletedUserRole));
+ sysUserRoleMapper.delete(deletedUserRole);
if (CollectionUtils.isNotEmpty(roleIdSet)) {
+ List userRoleList = new LinkedList<>();
for (Long roleId : roleIdSet) {
SysUserRole userRole = new SysUserRole();
userRole.setUserId(user.getUserId());
userRole.setRoleId(roleId);
- sysUserRoleMapper.insert(userRole);
+ userRoleList.add(userRole);
}
+ sysUserRoleMapper.insertList(userRoleList);
}
return true;
}
@@ -138,10 +142,13 @@ public class SysUserServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean changePassword(Long userId, String newPass) {
+ Example e = new Example(SysUser.class);
+ e.createCriteria()
+ .andEqualTo(super.idFieldName, userId)
+ .andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
SysUser updatedUser = new SysUser();
- updatedUser.setUserId(userId);
updatedUser.setPassword(passwordEncoder.encode(newPass));
- return sysUserMapper.updateById(updatedUser) == 1;
+ return sysUserMapper.updateByExampleSelective(updatedUser, e) == 1;
}
/**
@@ -153,12 +160,13 @@ public class SysUserServiceImpl extends BaseService implements Sy
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long userId) {
- if (sysUserMapper.deleteById(userId) == 0) {
+ // 这里先删除主数据
+ if (!this.removeById(userId)) {
return false;
}
SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId);
- sysUserRoleMapper.delete(new QueryWrapper<>(userRole));
+ sysUserRoleMapper.delete(userRole);
return true;
}
@@ -301,19 +309,19 @@ public class SysUserServiceImpl extends BaseService implements Sy
/**
* 验证用户对象关联的数据是否都合法。
*
- * @param sysUser 当前操作的对象。
- * @param originalSysUser 原有对象。
- * @param roleIdListString 逗号分隔的角色Id列表字符串。
+ * @param sysUser 当前操作的对象。
+ * @param originalSysUser 原有对象。
+ * @param roleIds 逗号分隔的角色Id列表字符串。
* @return 验证结果。
*/
@Override
- public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIdListString) {
+ public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser, String roleIds) {
JSONObject jsonObject = new JSONObject();
- if (StringUtils.isBlank(roleIdListString)) {
+ if (StringUtils.isBlank(roleIds)) {
return CallResult.error("数据验证失败，用户的角色数据不能为空！");
}
Set roleIdSet = Arrays.stream(
- roleIdListString.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+ roleIds.split(",")).map(Long::valueOf).collect(Collectors.toSet());
if (!sysRoleService.existAllPrimaryKeys(roleIdSet)) {
return CallResult.error("数据验证失败，存在不合法的用户角色，请刷新后重试！");
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/upms-service.iml b/orange-demo-multi-service/application/upms/upms-service/upms-service.iml
index 42b534e3..e148c95b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/upms-service.iml
+++ b/orange-demo-multi-service/application/upms/upms-service/upms-service.iml
@@ -63,20 +63,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -99,6 +102,7 @@
+
diff --git a/orange-demo-multi-service/common/common-core/common-core.iml b/orange-demo-multi-service/common/common-core/common-core.iml
index 9e79ae23..18d93ae3 100644
--- a/orange-demo-multi-service/common/common-core/common-core.iml
+++ b/orange-demo-multi-service/common/common-core/common-core.iml
@@ -77,20 +77,23 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/orange-demo-multi-service/common/common-core/pom.xml b/orange-demo-multi-service/common/common-core/pom.xml
index 640d41ac..09e0231f 100644
--- a/orange-demo-multi-service/common/common-core/pom.xml
+++ b/orange-demo-multi-service/common/common-core/pom.xml
@@ -97,9 +97,9 @@
${druid.version}
- com.baomidou
- mybatis-plus-boot-starter
- ${mybatisplus.version}
+ tk.mybatis
+ mapper-spring-boot-starter
+ ${mybatis-mapper.version}
com.github.pagehelper
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
new file mode 100644
index 00000000..19e0a067
--- /dev/null
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
@@ -0,0 +1,16 @@
+package com.orange.demo.common.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 主要用于标记逻辑删除字段。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DeletedFlagColumn {
+
+}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java
index 68c57626..b2a98f04 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DataSourceResolveAspect.java
@@ -27,7 +27,7 @@ import java.util.Map;
@Slf4j
public class DataSourceResolveAspect {
- private Map, DataSourceResolver> resolverMap = new HashMap<>();
+ private final Map, DataSourceResolver> resolverMap = new HashMap<>();
/**
* 所有配置MyDataSourceResovler注解的Service实现类。
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java
index b6bf2dc7..b508ea22 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/DictCacheSyncAspect.java
@@ -10,8 +10,6 @@ import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import java.io.Serializable;
-
/**
* 字典缓存同步的AOP。该AOP的优先级必须比事务切面的优先级高，因此会在事务外执行该切面的代码。
*
@@ -41,23 +39,23 @@ public class DictCacheSyncAspect {
Object arg = joinPoint.getArgs()[0];
if ("saveNew".equals(methodName)) {
Object data = joinPoint.proceed();
- BaseDictService service =
- (BaseDictService) joinPoint.getTarget();
+ BaseDictService service =
+ (BaseDictService) joinPoint.getTarget();
// 这里参数必须使用saveNew方法的返回对象，因为里面包含实际主键值。
service.putDictionaryCache(data);
return data;
} else if ("update".equals(methodName)) {
Object data = joinPoint.proceed();
- BaseDictService service =
- (BaseDictService) joinPoint.getTarget();
+ BaseDictService service =
+ (BaseDictService) joinPoint.getTarget();
// update的方法返回的是boolean，因此这里的参数需要使用第一个参数即可。
service.putDictionaryCache(arg);
return data;
} else {
// remove
- BaseDictService service =
- (BaseDictService) joinPoint.getTarget();
- service.removeDictionaryCache((Serializable) arg);
+ BaseDictService service =
+ (BaseDictService) joinPoint.getTarget();
+ service.removeDictionaryCache(arg);
return joinPoint.proceed();
}
}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
index 0dea07c9..51100df0 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
@@ -2,7 +2,6 @@ package com.orange.demo.common.core.base.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ReflectUtil;
-import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.constant.AggregationKind;
@@ -19,7 +18,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import java.io.Serializable;
+import javax.persistence.Id;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.util.LinkedList;
@@ -38,7 +37,7 @@ import java.util.stream.Collectors;
* @date 2020-08-08
*/
@Slf4j
-public abstract class BaseController {
+public abstract class BaseController {
/**
* 当前Service关联的主Model实体对象的Class。
@@ -69,7 +68,7 @@ public abstract class BaseController {
domainVoClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
- if (null != field.getAnnotation(TableId.class)) {
+ if (null != field.getAnnotation(Id.class)) {
idFieldName = field.getName();
break;
}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
index bfa9476b..aee78855 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
@@ -1,8 +1,10 @@
package com.orange.demo.common.core.base.dao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.annotation.RegisterMapper;
+import tk.mybatis.mapper.common.Mapper;
import java.util.List;
import java.util.Map;
@@ -14,7 +16,8 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
-public interface BaseDaoMapper extends BaseMapper {
+@RegisterMapper
+public interface BaseDaoMapper extends Mapper, InsertListMapper {
/**
* 根据指定的表名、显示字段列表、过滤条件字符串和分组字段，返回聚合计算后的查询结果。
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java
index 14818cf4..d30656c3 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java
@@ -1,8 +1,8 @@
package com.orange.demo.common.core.base.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
+import javax.persistence.Column;
import java.util.Date;
/**
@@ -17,24 +17,24 @@ public class BaseModel {
/**
* 创建者Id。
*/
- @TableField(value = "create_user_id")
+ @Column(name = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
- @TableField(value = "create_time")
+ @Column(name = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
- @TableField(value = "update_user_id")
+ @Column(name = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
- @TableField(value = "update_time")
+ @Column(name = "update_time")
private Date updateTime;
}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
index c37539e0..bff5e49f 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
@@ -1,7 +1,6 @@
package com.orange.demo.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;
@@ -9,8 +8,8 @@ import com.orange.demo.common.core.object.TokenData;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
-import java.io.Serializable;
import java.util.*;
/**
@@ -23,7 +22,7 @@ import java.util.*;
* @date 2020-08-08
*/
@Slf4j
-public abstract class BaseDictService extends BaseService implements IBaseDictService {
+public abstract class BaseDictService extends BaseService implements IBaseDictService {
/**
* 缓存池对象。
@@ -90,7 +89,15 @@ public abstract class BaseDictService extends BaseSer
if (tenantIdField != null) {
ReflectUtil.setFieldValue(data, tenantIdField, TokenData.takeFromRequest().getTenantId());
}
- return mapper().updateById(data) == 1;
+ if (deletedFlagFieldName != null) {
+ try {
+ setDeletedFlagMethod.invoke(data, GlobalDeletedFlag.NORMAL);
+ } catch (Exception e) {
+ log.error("Failed to call reflection [setDeletedFlagMethod] in BaseDictService.update.", e);
+ throw new MyRuntimeException(e);
+ }
+ }
+ return mapper().updateByPrimaryKey(data) == 1;
}
/**
@@ -102,7 +109,7 @@ public abstract class BaseDictService extends BaseSer
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(K id) {
- return mapper().deleteById(id) == 1;
+ return this.removeById(id);
}
/**
@@ -111,16 +118,15 @@ public abstract class BaseDictService extends BaseSer
* @param id 主键Id。
* @return 主键关联的数据，不存在返回null。
*/
- @SuppressWarnings("unchecked")
@Override
- public M getById(Serializable id) {
- M data = dictionaryCache.get((K) id);
+ public M getById(K id) {
+ M data = dictionaryCache.get(id);
if (data != null) {
return data;
}
data = super.getById(id);
if (data != null) {
- this.dictionaryCache.put((K) id, data);
+ this.dictionaryCache.put(id, data);
}
return data;
}
@@ -214,10 +220,8 @@ public abstract class BaseDictService extends BaseSer
List dataList = this.getInList((Set) inFilterValues);
return dataList.size() == inFilterValues.size();
}
- String columnName = this.safeMapToColumnName(inFilterField);
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.in(columnName, inFilterValues);
- return mapper().selectCount(queryWrapper) == inFilterValues.size();
+ Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, null);
+ return mapper().selectCountByExample(e) == inFilterValues.size();
}
/**
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
index 5a85ae70..89c1afb0 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
@@ -1,10 +1,5 @@
package com.orange.demo.common.core.base.service;
-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 cn.hutool.core.util.ReflectUtil;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.annotation.*;
@@ -13,7 +8,6 @@ import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.constant.AggregationKind;
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.exception.RemoteDataBuildException;
import com.orange.demo.common.core.object.*;
@@ -27,14 +21,20 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
-import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.lang.reflect.Modifier;
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.Consumer;
+import java.util.function.Supplier;
import static java.util.stream.Collectors.*;
@@ -47,7 +47,7 @@ import static java.util.stream.Collectors.*;
* @date 2020-08-08
*/
@Slf4j
-public abstract class BaseService extends ServiceImpl, M> implements IBaseService {
+public abstract class BaseService implements IBaseService {
/**
* 当前Service关联的主Model实体对象的Class。
*/
@@ -156,11 +156,6 @@ public abstract class BaseService extends ServiceImpl
private static final String AND_OP = " AND ";
- @Override
- public BaseDaoMapper getBaseMapper() {
- return mapper();
- }
-
/**
* 构造函数，在实例化的时候，一次性完成所有有关主Model对象信息的加载。
*/
@@ -168,7 +163,7 @@ public abstract class BaseService extends ServiceImpl
public BaseService() {
modelClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
idFieldClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
- this.tableName = modelClass.getAnnotation(TableName.class).value();
+ this.tableName = modelClass.getAnnotation(Table.class).name();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
initializeField(field);
@@ -176,10 +171,10 @@ public abstract class BaseService extends ServiceImpl
}
private void initializeField(Field field) {
- if (idFieldName == null && null != field.getAnnotation(TableId.class)) {
+ if (idFieldName == null && null != field.getAnnotation(Id.class)) {
idFieldName = field.getName();
- TableId c = field.getAnnotation(TableId.class);
- idColumnName = c == null ? idFieldName : c.value();
+ Column c = field.getAnnotation(Column.class);
+ idColumnName = c == null ? idFieldName : c.name();
setIdFieldMethod = ReflectUtil.getMethod(
modelClass, "set" + StringUtils.capitalize(idFieldName), idFieldClass);
getIdFieldMethod = ReflectUtil.getMethod(
@@ -187,18 +182,21 @@ public abstract class BaseService extends ServiceImpl
}
if (updateTimeFieldName == null && null != field.getAnnotation(JobUpdateTimeColumn.class)) {
updateTimeFieldName = field.getName();
- updateTimeColumnName = this.safeMapToColumnName(updateTimeFieldName);
+ Column c = field.getAnnotation(Column.class);
+ updateTimeColumnName = c == null ? updateTimeFieldName : c.name();
}
- if (deletedFlagFieldName == null && null != field.getAnnotation(TableLogic.class)) {
+ if (deletedFlagFieldName == null && null != field.getAnnotation(DeletedFlagColumn.class)) {
deletedFlagFieldName = field.getName();
- deletedFlagColumnName = this.safeMapToColumnName(deletedFlagFieldName);
+ Column c = field.getAnnotation(Column.class);
+ deletedFlagColumnName = c == null ? deletedFlagFieldName : c.name();
setDeletedFlagMethod = ReflectUtil.getMethod(
modelClass, "set" + StringUtils.capitalize(deletedFlagFieldName), Integer.class);
}
if (tenantIdFieldName == null && null != field.getAnnotation(TenantFilterColumn.class)) {
tenantIdField = field;
tenantIdFieldName = field.getName();
- tenantIdColumnName = this.safeMapToColumnName(tenantIdFieldName);
+ Column c = field.getAnnotation(Column.class);
+ tenantIdColumnName = c == null ? tenantIdFieldName : c.name();
}
}
@@ -221,6 +219,31 @@ public abstract class BaseService extends ServiceImpl
return false;
}
+ /**
+ * 基于主键Id删除数据。如果包含逻辑删除字段，则进行逻辑删除。
+ *
+ * @param id 主键Id值。
+ * @return true删除成功，false数据不存在。
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public boolean removeById(K id) {
+ if (this.deletedFlagFieldName == null) {
+ return mapper().deleteByPrimaryKey(id) == 1;
+ }
+ try {
+ Example e = new Example(modelClass);
+ Example.Criteria c = e.createCriteria().andEqualTo(idFieldName, id);
+ c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ M data = modelClass.newInstance();
+ setDeletedFlagMethod.invoke(data, GlobalDeletedFlag.DELETED);
+ return mapper().updateByExampleSelective(data, e) == 1;
+ } catch (Exception ex) {
+ log.error("Failed to call reflection method in BaseService.removeById.", ex);
+ throw new MyRuntimeException(ex);
+ }
+ }
+
/**
* 根据过滤条件删除数据。
*
@@ -230,7 +253,25 @@ public abstract class BaseService extends ServiceImpl
@Transactional(rollbackFor = Exception.class)
@Override
public Integer removeBy(M filter) {
- return mapper().delete(new QueryWrapper<>(filter));
+ if (deletedFlagFieldName == null) {
+ return mapper().delete(filter);
+ }
+ Example e = new Example(modelClass);
+ Example.Criteria c = e.createCriteria();
+ Field[] fields = ReflectUtil.getFields(modelClass);
+ for (Field field : fields) {
+ if (field.getAnnotation(Transient.class) == null) {
+ this.assembleCriteriaByFilter(filter, field, c);
+ }
+ }
+ try {
+ M deletedObject = modelClass.newInstance();
+ this.setDeletedFlagMethod.invoke(deletedObject, GlobalDeletedFlag.DELETED);
+ return mapper().updateByExampleSelective(deletedObject, e);
+ } catch (Exception ex) {
+ log.error("Failed to call reflection method in BaseService.removeBy.", ex);
+ throw new MyRuntimeException(ex);
+ }
}
/**
@@ -258,8 +299,27 @@ public abstract class BaseService extends ServiceImpl
if (fieldName.equals(this.idFieldName)) {
return this.existId((K) fieldValue);
}
- String columnName = MyModelUtil.mapToColumnName(fieldName, modelClass);
- return mapper().selectCount(new QueryWrapper().eq(columnName, fieldValue)) == 1;
+ Example e = new Example(modelClass);
+ e.createCriteria().andEqualTo(fieldName, fieldValue);
+ return mapper().selectCountByExample(e) == 1;
+ }
+
+ /**
+ * 获取主键Id关联的数据。
+ *
+ * @param id 主键Id
+ * @return 主键关联的数据，不存在返回null。
+ */
+ @Override
+ public M getById(K id) {
+ if (deletedFlagFieldName == null) {
+ return mapper().selectByPrimaryKey(id);
+ }
+ Example e = new Example(modelClass);
+ e.createCriteria()
+ .andEqualTo(idFieldName, id)
+ .andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ return mapper().selectOneByExample(e);
}
/**
@@ -275,9 +335,12 @@ public abstract class BaseService extends ServiceImpl
if (filterField.equals(idFieldName)) {
return this.getById((K) filterValue);
}
- String columnName = this.safeMapToColumnName(filterField);
- QueryWrapper queryWrapper = new QueryWrapper().eq(columnName, filterValue);
- return mapper().selectOne(queryWrapper);
+ Example e = new Example(modelClass);
+ Example.Criteria c = e.createCriteria().andEqualTo(filterField, filterValue);
+ if (deletedFlagFieldName != null) {
+ c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ }
+ return mapper().selectOneByExample(e);
}
/**
@@ -302,7 +365,12 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public List getAllList() {
- return mapper().selectList(Wrappers.emptyWrapper());
+ if (deletedFlagFieldName == null) {
+ return mapper().selectAll();
+ }
+ Example e = new Example(modelClass);
+ e.createCriteria().andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ return mapper().selectByExample(e);
}
/**
@@ -313,11 +381,14 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public List getAllListByOrder(String... orderByProperties) {
- String[] columns = new String[orderByProperties.length];
- for (int i = 0; i < orderByProperties.length; i++) {
- columns[i] = this.safeMapToColumnName(orderByProperties[i]);
+ Example e = new Example(modelClass);
+ for (String orderByProperty : orderByProperties) {
+ e.orderBy(orderByProperty);
}
- return mapper().selectList(new QueryWrapper().orderByAsc(columns));
+ if (deletedFlagFieldName != null) {
+ e.and().andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ }
+ return mapper().selectByExample(e);
}
/**
@@ -346,8 +417,8 @@ public abstract class BaseService extends ServiceImpl
if (CollectionUtils.isEmpty(inFilterValues)) {
return true;
}
- String column = this.safeMapToColumnName(inFilterField);
- return mapper().selectCount(new QueryWrapper().in(column, inFilterValues)) == inFilterValues.size();
+ Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, null);
+ return mapper().selectCountByExample(e) == inFilterValues.size();
}
/**
@@ -386,12 +457,8 @@ public abstract class BaseService extends ServiceImpl
if (CollectionUtils.isEmpty(inFilterValues)) {
return new LinkedList<>();
}
- String column = this.safeMapToColumnName(inFilterField);
- QueryWrapper queryWrapper = new QueryWrapper().in(column, inFilterValues);
- if (StringUtils.isNotBlank(orderBy)) {
- queryWrapper.last(orderBy);
- }
- return mapper().selectList(queryWrapper);
+ Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, orderBy);
+ return mapper().selectByExample(e);
}
/**
@@ -402,7 +469,16 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public int getCountByFilter(M filter) {
- return mapper().selectCount(new QueryWrapper<>(filter));
+ if (deletedFlagFieldName == null) {
+ return mapper().selectCount(filter);
+ }
+ try {
+ setDeletedFlagMethod.invoke(filter, GlobalDeletedFlag.NORMAL);
+ return mapper().selectCount(filter);
+ } catch (Exception e) {
+ log.error("Failed to call reflection [setDeletedFlagMethod] in BaseService.getCountByFilter.", e);
+ throw new MyRuntimeException(e);
+ }
}
/**
@@ -424,7 +500,42 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public List getListByFilter(M filter) {
- return mapper().selectList(new QueryWrapper<>(filter));
+ if (filter == null) {
+ return this.getAllList();
+ }
+ if (deletedFlagFieldName == null) {
+ return mapper().select(filter);
+ }
+ try {
+ setDeletedFlagMethod.invoke(filter, GlobalDeletedFlag.NORMAL);
+ return mapper().select(filter);
+ } catch (Exception ex) {
+ log.error("Failed to call reflection code of BaseService.getListByFilter.", ex);
+ throw new MyRuntimeException(ex);
+ }
+ }
+
+ private void assembleCriteriaByFilter(M filter, Field field, Example.Criteria c) {
+ int modifiers = field.getModifiers();
+ // transient类型的字段不能作为查询条件
+ int transientMask = 128;
+ if ((modifiers & transientMask) != 0 || Modifier.isStatic(modifiers)) {
+ return;
+ }
+ if (field.getName().equals(deletedFlagFieldName)) {
+ c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ } else {
+ ReflectUtil.setAccessible(field);
+ try {
+ Object o = field.get(filter);
+ if (o != null) {
+ c.andEqualTo(field.getName(), field.get(filter));
+ }
+ } catch (IllegalAccessException ex) {
+ log.error("Failed to call reflection code of BaseService.getListByFilter.", ex);
+ throw new MyRuntimeException(ex);
+ }
+ }
}
/**
@@ -436,14 +547,17 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public List getListByParentId(String parentIdFieldName, K parentId) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- String parentIdColumn = this.safeMapToColumnName(parentIdFieldName);
+ Example e = new Example(modelClass);
+ Example.Criteria c = e.createCriteria();
if (parentId != null) {
- queryWrapper.eq(parentIdColumn, parentId);
+ c.andEqualTo(parentIdFieldName, parentId);
} else {
- queryWrapper.isNull(parentIdColumn);
+ c.andIsNull(parentIdFieldName);
}
- return mapper().selectList(queryWrapper);
+ if (deletedFlagFieldName != null) {
+ c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+ }
+ return mapper().selectByExample(e);
}
/**
@@ -473,21 +587,32 @@ public abstract class BaseService extends ServiceImpl
*/
@Override
public List getListByCondition(List selectList, M filter, String whereClause, String orderBy) {
- QueryWrapper queryWrapper = new QueryWrapper<>(filter);
+ Example e = new Example(modelClass);
+ Example.Criteria c = null;
if (CollectionUtils.isNotEmpty(selectList)) {
- String[] columns = new String[selectList.size()];
- for (int i = 0; i < selectList.size(); i++) {
- columns[i] = this.safeMapToColumnName(selectList.get(i));
- }
- queryWrapper.select(columns);
- }
- if (StringUtils.isNotBlank(whereClause)) {
- queryWrapper.apply(whereClause);
+ String[] selectFields = new String[selectList.size()];
+ selectList.toArray(selectFields);
+ e.selectProperties(selectFields);
}
if (StringUtils.isNotBlank(orderBy)) {
- queryWrapper.last(" ORDER BY " + orderBy);
+ e.setOrderByClause(orderBy);
}
- return mapper().selectList(queryWrapper);
+ if (filter != null) {
+ c = e.createCriteria();
+ Field[] fields = ReflectUtil.getFields(modelClass);
+ for (Field field : fields) {
+ if (field.getAnnotation(Transient.class) == null) {
+ this.assembleCriteriaByFilter(filter, field, c);
+ }
+ }
+ }
+ if (StringUtils.isNotBlank(whereClause)) {
+ if (c == null) {
+ c = e.createCriteria();
+ }
+ c.andCondition(whereClause);
+ }
+ return mapper().selectByExample(e);
}
/**
@@ -592,7 +717,7 @@ public abstract class BaseService extends ServiceImpl
*
* @param resultList 主表实体对象列表。数据集成将直接作用于该对象列表。
* @param relationParam 实体对象数据组装的参数构建器。
- * @param batchSize 每批集成的记录数量。小于等于时将不做分批处理。
+ * @param batchSize 每批集成的记录数量。小于等于0时将不做分批处理。
*/
@Override
public void buildRelationForDataList(List resultList, MyRelationParam relationParam, int batchSize) {
@@ -613,7 +738,7 @@ public abstract class BaseService extends ServiceImpl
*
* @param resultList 主表实体对象列表。数据集成将直接作用于该对象列表。
* @param relationParam 实体对象数据组装的参数构建器。
- * @param batchSize 每批集成的记录数量。小于等于时将不做分批处理。
+ * @param batchSize 每批集成的记录数量。小于等于0时将不做分批处理。
* @param ignoreFields 该集合中的字段，即便包含注解也不会在当前调用中进行数据组装。
*/
@Override
@@ -786,10 +911,9 @@ public abstract class BaseService extends ServiceImpl
continue;
}
Object masterIdValue = ReflectUtil.getFieldValue(dataObject, relationStruct.masterIdField);
- String masterIdColumn = this.safeMapToColumnName(relationStruct.masterIdField.getName());
- Map filterMap = new HashMap<>(1);
- filterMap.put(masterIdColumn, masterIdValue);
- List manyToManyList = relationStruct.manyToManyMapper.selectByMap(filterMap);
+ Example e = new Example(relationStruct.relationManyToMany.relationModelClass());
+ e.createCriteria().andEqualTo(relationStruct.masterIdField.getName(), masterIdValue);
+ List manyToManyList = relationStruct.manyToManyMapper.selectByExample(e);
ReflectUtil.setFieldValue(dataObject, relationStruct.relationField, manyToManyList);
}
}
@@ -1180,7 +1304,7 @@ public abstract class BaseService extends ServiceImpl
if (CollectionUtils.isEmpty(masterIdSet)) {
continue;
}
- BaseService relationService = relationStruct.localService;
+ BaseService relationService = relationStruct.localService;
List