From 0c5b1fb1a93a07cff6dd02d227dc8efcd5798a9b Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Fri, 16 Jul 2021 14:13:26 +0800 Subject: [PATCH] screen-api 更新MybatisPLUS版本 --- screen-api/src/main/java/com/moral/api/entity/GroupMenu.java | 5 screen-manage/src/main/java/com/moral/api/entity/SysDictData.java | 5 screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 5 screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 4 screen-manage/src/main/java/com/moral/api/entity/Version.java | 5 screen-api/src/main/java/com/moral/api/entity/ManageAccount.java | 5 screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java | 5 screen-api/src/main/java/com/moral/api/entity/SysConfig.java | 5 screen-api/src/main/java/com/moral/api/entity/UnitConversion.java | 6 screen-manage/src/main/java/com/moral/api/entity/Test.java | 5 screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java | 5 screen-api/src/main/java/com/moral/api/entity/UserGroup.java | 5 screen-api/src/main/java/com/moral/api/entity/Test.java | 5 screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java | 7 screen-api/src/main/java/com/moral/api/entity/Menu.java | 5 screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java | 5 screen-manage/src/main/java/com/moral/api/entity/ManageLog.java | 5 screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java | 5 screen-api/src/main/java/com/moral/api/entity/UserLog.java | 5 screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 4 screen-api/src/main/java/com/moral/api/entity/ManageRole.java | 5 screen-manage/src/main/java/com/moral/api/entity/Organization.java | 5 screen-manage/src/main/java/com/moral/api/entity/User.java | 5 screen-api/src/main/java/com/moral/api/entity/Group.java | 4 screen-manage/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java | 12 screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 5 screen.iml | 993 ++++++++++++++++++++++++++++++++++++++++++++ screen-api/src/main/java/com/moral/api/entity/Version.java | 5 screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java | 5 screen-manage/src/main/java/com/moral/api/entity/SysConfig.java | 5 screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java | 5 screen-manage/src/main/java/com/moral/api/entity/Group.java | 6 screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java | 5 screen-api/src/main/java/com/moral/api/entity/Device.java | 5 screen-manage/src/main/java/com/moral/api/entity/Device.java | 4 screen-api/src/main/java/com/moral/api/entity/ManageLog.java | 4 screen-manage/src/main/java/com/moral/api/entity/ManageRole.java | 5 screen-api/src/main/java/com/moral/api/entity/User.java | 5 screen-manage/src/main/java/com/moral/api/entity/SysArea.java | 5 screen-manage/src/main/java/com/moral/api/entity/SysDictType.java | 5 screen-api/src/main/java/com/moral/api/entity/OrganizationMenu.java | 5 screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java | 5 screen-api/src/main/java/com/moral/api/entity/ManageMenu.java | 4 screen-manage/src/main/java/com/moral/api/entity/OrganizationMenu.java | 5 screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java | 4 screen-manage/src/main/java/com/moral/api/entity/UserLog.java | 4 screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java | 18 screen-api/src/main/java/com/moral/api/entity/SysDictType.java | 5 screen-api/src/main/java/com/moral/api/entity/ManageRoleMenu.java | 5 screen-manage/src/main/java/com/moral/api/entity/Menu.java | 5 screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java | 5 screen-api/src/main/java/com/moral/api/entity/Organization.java | 5 screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java | 5 screen-manage/src/main/java/com/moral/api/entity/UserGroup.java | 4 screen-api/src/main/java/com/moral/api/entity/SysArea.java | 6 screen-api/src/main/java/com/moral/api/entity/SysDictData.java | 5 56 files changed, 1,005 insertions(+), 279 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java b/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java index 8b810d5..b919465 100644 --- a/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java +++ b/screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java @@ -1,13 +1,10 @@ package com.moral.api.config.mybatis; -import com.baomidou.mybatisplus.core.parser.ISqlParser; -import com.baomidou.mybatisplus.extension.parsers.DynamicTableNameParser; -import com.baomidou.mybatisplus.extension.parsers.ITableNameHandler; +import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.handler.TableNameHandler; import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor; -import org.apache.ibatis.reflection.MetaObject; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -19,15 +16,6 @@ public class MybatisPlusConfig { /** - * ������������ - */ - @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - return paginationInterceptor; - } - - /** * @Description: ������������������ * @Param: [] * @return: com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor @@ -37,6 +25,8 @@ @Bean public MybatisPlusInterceptor mybatisPlusInterceptor(){ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + //������������ + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor(); HashMap<String, TableNameHandler> map = new HashMap<String, TableNameHandler>(); map.put("history_five_minutely",(sql,tableName)->{ Date date = new Date(); diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java index 63226a2..1e9e286 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Device.java +++ b/screen-api/src/main/java/com/moral/api/entity/Device.java @@ -136,10 +136,7 @@ @TableField(exist = false) private Version version; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/Group.java b/screen-api/src/main/java/com/moral/api/entity/Group.java index 0b79a9b..0a9dc8e 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Group.java +++ b/screen-api/src/main/java/com/moral/api/entity/Group.java @@ -61,9 +61,5 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java b/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java index b91ca86..a2aefdf 100644 --- a/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java +++ b/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java @@ -69,9 +69,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java b/screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java index c6b463b..705f92b 100644 --- a/screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java +++ b/screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java @@ -37,9 +37,4 @@ private String value; - @Override - protected Serializable pkVal() { - return null; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java b/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java index efa413c..045fdd6 100644 --- a/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java +++ b/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java @@ -42,9 +42,6 @@ private Integer version; - @Override - protected Serializable pkVal() { - return null; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java b/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java index c796f6e..805cde8 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java @@ -75,9 +75,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java b/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java index c3add8c..996eed7 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java @@ -55,9 +55,5 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageLog.java b/screen-api/src/main/java/com/moral/api/entity/ManageLog.java index 516426e..7f178f3 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageLog.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageLog.java @@ -66,9 +66,5 @@ private LocalDateTime createTime; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java index 7249cfc..bb180b6 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java @@ -75,9 +75,5 @@ private String desc; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java index a5a5497..5a99da7 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java @@ -55,9 +55,6 @@ private String desc; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageRoleMenu.java b/screen-api/src/main/java/com/moral/api/entity/ManageRoleMenu.java index 29e6a4c..c4a64c0 100644 --- a/screen-api/src/main/java/com/moral/api/entity/ManageRoleMenu.java +++ b/screen-api/src/main/java/com/moral/api/entity/ManageRoleMenu.java @@ -55,9 +55,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/Menu.java b/screen-api/src/main/java/com/moral/api/entity/Menu.java index acfd0c9..2da0df2 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Menu.java +++ b/screen-api/src/main/java/com/moral/api/entity/Menu.java @@ -77,9 +77,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java b/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java index efbf0c8..5daa7ef 100644 --- a/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java +++ b/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java @@ -100,9 +100,6 @@ private List<Device> devices; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/Organization.java b/screen-api/src/main/java/com/moral/api/entity/Organization.java index d204a71..cbc3b98 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Organization.java +++ b/screen-api/src/main/java/com/moral/api/entity/Organization.java @@ -125,9 +125,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/OrganizationMenu.java b/screen-api/src/main/java/com/moral/api/entity/OrganizationMenu.java index 435beba..50b9877 100644 --- a/screen-api/src/main/java/com/moral/api/entity/OrganizationMenu.java +++ b/screen-api/src/main/java/com/moral/api/entity/OrganizationMenu.java @@ -60,9 +60,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java index d76bb32..42794b5 100644 --- a/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java +++ b/screen-api/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java @@ -74,9 +74,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/SysArea.java b/screen-api/src/main/java/com/moral/api/entity/SysArea.java index 09fa8be..540c8a8 100644 --- a/screen-api/src/main/java/com/moral/api/entity/SysArea.java +++ b/screen-api/src/main/java/com/moral/api/entity/SysArea.java @@ -34,10 +34,4 @@ */ private Integer parentCode; - - @Override - protected Serializable pkVal() { - return this.areaCode; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java index 30d0e9d..49b4961 100644 --- a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java +++ b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java @@ -64,9 +64,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java index 9866782..3841912 100644 --- a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java +++ b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java @@ -63,9 +63,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java index e479894..d1d0dcf 100644 --- a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java +++ b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java @@ -60,9 +60,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/Test.java b/screen-api/src/main/java/com/moral/api/entity/Test.java index 05ff045..5ffd613 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Test.java +++ b/screen-api/src/main/java/com/moral/api/entity/Test.java @@ -43,9 +43,6 @@ private String mobile; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java index 962842d..0186724 100644 --- a/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java +++ b/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java @@ -65,10 +65,4 @@ */ private String isDelete; - - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java index cf22cd8..1ee5ef9 100644 --- a/screen-api/src/main/java/com/moral/api/entity/User.java +++ b/screen-api/src/main/java/com/moral/api/entity/User.java @@ -101,9 +101,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/UserGroup.java b/screen-api/src/main/java/com/moral/api/entity/UserGroup.java index 05d4e2f..b76e5fb 100644 --- a/screen-api/src/main/java/com/moral/api/entity/UserGroup.java +++ b/screen-api/src/main/java/com/moral/api/entity/UserGroup.java @@ -61,9 +61,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-api/src/main/java/com/moral/api/entity/UserLog.java b/screen-api/src/main/java/com/moral/api/entity/UserLog.java index 416fef5..6835e47 100644 --- a/screen-api/src/main/java/com/moral/api/entity/UserLog.java +++ b/screen-api/src/main/java/com/moral/api/entity/UserLog.java @@ -63,9 +63,6 @@ private Date createTime; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-api/src/main/java/com/moral/api/entity/Version.java b/screen-api/src/main/java/com/moral/api/entity/Version.java index 91e74d8..74d5385 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Version.java +++ b/screen-api/src/main/java/com/moral/api/entity/Version.java @@ -64,9 +64,6 @@ private List<Sensor> sensors; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-manage/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java b/screen-manage/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java index 4a253f7..c5d3443 100644 --- a/screen-manage/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java +++ b/screen-manage/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java @@ -1,8 +1,11 @@ package com.moral.api.config.mybatis; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; + @@ -13,9 +16,10 @@ * ������������ */ @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor page = new PaginationInterceptor(); - return page; + public MybatisPlusInterceptor mybatisPlusInterceptor(){ + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Device.java b/screen-manage/src/main/java/com/moral/api/entity/Device.java index 646024a..f933fe0 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Device.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Device.java @@ -136,9 +136,5 @@ @TableField(exist = false) private Version version; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java index 305ba7d..602ea08 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java +++ b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java @@ -72,9 +72,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Group.java b/screen-manage/src/main/java/com/moral/api/entity/Group.java index 0b79a9b..7671674 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Group.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Group.java @@ -60,10 +60,4 @@ */ private String isDelete; - - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java b/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java index 7adb89b..90a46bd 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java +++ b/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java @@ -71,9 +71,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java b/screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java index 08c64b6..6c713f3 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java +++ b/screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java @@ -43,9 +43,4 @@ private Integer version; - @Override - protected Serializable pkVal() { - return null; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java index 971aa9f..30706e1 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java @@ -83,9 +83,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java index 930396a..81adacd 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java @@ -56,9 +56,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java index ade2ae0..4896edc 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java @@ -67,9 +67,4 @@ private Date createTime; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java index 522ee7e..8fc4e21 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java @@ -87,9 +87,5 @@ @TableField(exist = false) private List<ManageMenu> children; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java index 8aefd79..557244f 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java @@ -62,9 +62,4 @@ private String desc; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java b/screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java index 122d9cb..1f1a1ba 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java +++ b/screen-manage/src/main/java/com/moral/api/entity/ManageRoleMenu.java @@ -54,9 +54,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Menu.java b/screen-manage/src/main/java/com/moral/api/entity/Menu.java index 9d6164f..1054e55 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Menu.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Menu.java @@ -77,9 +77,4 @@ private List<Menu> children; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java b/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java index 559bdf6..55876bf 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java +++ b/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java @@ -92,9 +92,4 @@ private String desc; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Organization.java b/screen-manage/src/main/java/com/moral/api/entity/Organization.java index a1eb06c..905b786 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Organization.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Organization.java @@ -126,9 +126,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/OrganizationMenu.java b/screen-manage/src/main/java/com/moral/api/entity/OrganizationMenu.java index 4e8f5d8..36f80aa 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/OrganizationMenu.java +++ b/screen-manage/src/main/java/com/moral/api/entity/OrganizationMenu.java @@ -59,9 +59,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java index 6ac8cc3..a3cc4d2 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java +++ b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java @@ -76,9 +76,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysArea.java b/screen-manage/src/main/java/com/moral/api/entity/SysArea.java index 392aa29..36a4673 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/SysArea.java +++ b/screen-manage/src/main/java/com/moral/api/entity/SysArea.java @@ -44,9 +44,4 @@ private List<SysArea> children; - @Override - protected Serializable pkVal() { - return this.areaCode; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java index 0afcbde..a4fa28e 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java +++ b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java @@ -63,9 +63,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java b/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java index 6a6e2a8..51ba067 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java +++ b/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java @@ -64,9 +64,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java index 862e7c7..7044853 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java +++ b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java @@ -64,9 +64,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Test.java b/screen-manage/src/main/java/com/moral/api/entity/Test.java index c598ace..33f0eba 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Test.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Test.java @@ -44,9 +44,4 @@ private String mobile; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java index 348cd15..0a5f242 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java +++ b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; + import java.time.LocalDateTime; import java.io.Serializable; import java.util.Date; @@ -65,11 +66,5 @@ */ private String isDelete; - - - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-manage/src/main/java/com/moral/api/entity/User.java b/screen-manage/src/main/java/com/moral/api/entity/User.java index 15bf9e3..397231c 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/User.java +++ b/screen-manage/src/main/java/com/moral/api/entity/User.java @@ -97,9 +97,4 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java b/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java index a4def76..454644e 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java +++ b/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java @@ -61,9 +61,5 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java index 416fef5..226dbae 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java +++ b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java @@ -63,9 +63,5 @@ private Date createTime; - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen-manage/src/main/java/com/moral/api/entity/Version.java b/screen-manage/src/main/java/com/moral/api/entity/Version.java index 573bf94..9817adf 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Version.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Version.java @@ -65,9 +65,6 @@ private List<Sensor> sensors; - @Override - protected Serializable pkVal() { - return this.id; - } + } diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java index 0e2ee21..c733a49 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java +++ b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java @@ -95,9 +95,5 @@ return Objects.hash(super.hashCode(), sensorCode, unitKey, upper, lower); } - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/screen.iml b/screen.iml index c7561d7..aa08dcf 100644 --- a/screen.iml +++ b/screen.iml @@ -4,17 +4,984 @@ <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/home" /> - <excludeFolder url="file://$MODULE_DIR$/home/moral/soft/log/screen-manage/%d{yyyy-MM-dd}" /> - <excludeFolder url="file://$MODULE_DIR$/home/moral/soft/log/screen-manage/2021-06-08" /> - <excludeFolder url="file://$MODULE_DIR$/home/moral/soft/log/springAppName_IS_UNDEFINED" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.2.5" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/aviator/aviator/5.2.5/aviator-5.2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/github/xiaoymin/swagger-bootstrap-ui/1.9.6/swagger-bootstrap-ui-1.9.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.25.0-GA/javassist-3.25.0-GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.7.0/springfox-swagger2-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.13/swagger-models-1.5.13.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.7.0/springfox-spi-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.7.0/springfox-core-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.16/byte-buddy-1.9.16.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/18.0/guava-18.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.14.RELEASE/spring-beans-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.14.RELEASE/spring-core-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.14.RELEASE/spring-jcl-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.14.RELEASE/spring-context-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.14.RELEASE/spring-aop-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.14.RELEASE/spring-expression-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.7.0/springfox-schema-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.7.0/springfox-swagger-common-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.7.0/springfox-spring-web-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.1.13.RELEASE/spring-boot-starter-test-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.13.RELEASE/spring-boot-starter-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.13.RELEASE/spring-boot-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.13.RELEASE/spring-boot-autoconfigure-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.13.RELEASE/spring-boot-starter-logging-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.13.RELEASE/spring-boot-test-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.1.13.RELEASE/spring-boot-test-autoconfigure-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.16/byte-buddy-agent-1.9.16.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.14.RELEASE/spring-test-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/xuxueli/xxl-job-core/2.3.0/xxl-job-core-2.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.45.Final/netty-all-4.1.45.Final.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.9/groovy-2.5.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/kafka/kafka-streams/2.2.2/kafka-streams-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/kafka/kafka-clients/2.2.2/kafka-clients-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lz4/lz4-java/1.5.0/lz4-java-1.5.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/xerial/snappy/snappy-java/1.1.7.2/snappy-java-1.1.7.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/kafka/connect-json/2.0.1/connect-json-2.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/kafka/connect-api/2.0.1/connect-api-2.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.10.3/jackson-databind-2.9.10.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/rocksdb/rocksdbjni/5.15.10/rocksdbjni-5.15.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.7.0/springfox-swagger-ui-2.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.1.13.RELEASE/spring-boot-starter-aop-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.1.13.RELEASE/spring-boot-starter-websocket-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.13.RELEASE/spring-boot-starter-web-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.13.RELEASE/spring-boot-starter-json-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.14.RELEASE/spring-web-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.10/jackson-datatype-jdk8-2.9.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.10/jackson-datatype-jsr310-2.9.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.10/jackson-module-parameter-names-2.9.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.13.RELEASE/spring-boot-starter-tomcat-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.31/tomcat-embed-core-9.0.31.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.31/tomcat-embed-el-9.0.31.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.31/tomcat-embed-websocket-9.0.31.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.3.Final/jboss-logging-3.3.3.Final.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.14.RELEASE/spring-webmvc-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.1.14.RELEASE/spring-messaging-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.1.14.RELEASE/spring-websocket-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/github/luben/zstd-jni/1.3.8-1/zstd-jni-1.3.8-1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.1/mybatis-plus-boot-starter-3.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.1/mybatis-plus-3.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.1/mybatis-plus-extension-3.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.1/mybatis-plus-core-3.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.1/mybatis-plus-annotation-3.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/3.2/jsqlparser-3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.6/mybatis-3.5.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.5/mybatis-spring-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.13.RELEASE/spring-boot-starter-jdbc-2.1.13.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.14.RELEASE/spring-jdbc-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.14.RELEASE/spring-tx-5.1.14.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.5/druid-1.1.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/kafka/spring-kafka/2.2.12.RELEASE/spring-kafka-2.2.12.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/com/google/code/kaptcha/kaptcha/2.3.2/kaptcha-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.13.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" /> @@ -63,14 +1030,14 @@ <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.6" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.4" level="project" /> + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.1" level="project" /> + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.1" level="project" /> + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3.1" level="project" /> + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3.1" level="project" /> + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3.1" level="project" /> + <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" /> + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" /> + <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" /> -- Gitblit v1.8.0