Explorar el Código

basic代码优化

lixing hace 4 años
padre
commit
b624f76f57

+ 0 - 11
fm-common/pom.xml

@@ -11,12 +11,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-common</artifactId>
 
-    <properties>
-        <mybatis-plus.version>3.3.0</mybatis-plus.version>
-        <druid-spring-boot-starter.version>1.1.22</druid-spring-boot-starter.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
-    </properties>
-
     <dependencies>
         <!-- 集成框架工具类 -->
         <dependency>
@@ -35,7 +29,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus.version}</version>
         </dependency>
         <!-- jackson -->
         <dependency>
@@ -47,7 +40,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
         </dependency>
         <!-- mysql -->
         <dependency>
@@ -58,18 +50,15 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid-spring-boot-starter.version}</version>
         </dependency>
         <!-- mapstruct 优雅的进行bean与dto的转换 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-jdk8</artifactId>
-            <version>${mapstruct.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
         </dependency>
         <!-- mybatisPlus相关的依赖 end -->
 

+ 8 - 8
fm-common/src/main/java/com/persagy/fm/common/config/MybatisPlusMetaObjectHandler.java

@@ -1,7 +1,7 @@
 package com.persagy.fm.common.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.persagy.fm.common.constant.enums.EnumValid;
+import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.persagy.fm.common.model.entity.AuditableEntity;
 import com.persagy.fm.common.model.entity.BaseEntity;
 import org.apache.ibatis.reflection.MetaObject;
@@ -20,21 +20,21 @@ import java.util.Date;
 public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
-        if (metaObject.hasSetter(AuditableEntity.PROP_CREATIONTIME)) {
-            this.setFieldValByName(AuditableEntity.PROP_CREATIONTIME, new Date(), metaObject);
+        if (metaObject.hasSetter(AuditableEntity.DO_PROP_CREATIONTIME)) {
+            this.setFieldValByName(AuditableEntity.DO_PROP_CREATIONTIME, new Date(), metaObject);
         }
-        if (metaObject.hasSetter(AuditableEntity.PROP_MODIFIEDTIME)) {
-            this.setFieldValByName(AuditableEntity.PROP_MODIFIEDTIME, new Date(), metaObject);
+        if (metaObject.hasSetter(AuditableEntity.DO_PROP_MODIFIEDTIME)) {
+            this.setFieldValByName(AuditableEntity.DO_PROP_MODIFIEDTIME, new Date(), metaObject);
         }
         if (metaObject.hasSetter(BaseEntity.PROP_VALID)) {
-            this.setFieldValByName(BaseEntity.PROP_VALID, EnumValid.TRUE.getType(), metaObject);
+            this.setFieldValByName(BaseEntity.PROP_VALID, ValidEnum.TRUE.getType(), metaObject);
         }
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        if (metaObject.hasSetter(AuditableEntity.PROP_MODIFIEDTIME)) {
-            this.setFieldValByName(AuditableEntity.PROP_MODIFIEDTIME, new Date(), metaObject);
+        if (metaObject.hasSetter(AuditableEntity.DO_PROP_MODIFIEDTIME)) {
+            this.setFieldValByName(AuditableEntity.DO_PROP_MODIFIEDTIME, new Date(), metaObject);
         }
     }
 }

+ 4 - 2
fm-common/src/main/java/com/persagy/fm/common/model/entity/AuditableEntity.java

@@ -19,13 +19,15 @@ public abstract class AuditableEntity<T> extends BaseEntity<T> implements IAudit
     private static final long serialVersionUID = -6039076670318997447L;
 
     /** 创建时间 */
-    public static final String PROP_CREATIONTIME = "creationTime";
+    public static final String PROP_CREATIONTIME = "creation_time";
+    public static final String DO_PROP_CREATIONTIME = "creationTime";
 
     /** 创建人 */
     public static final String PROP_CREATOR = "creator";
 
     /** 最后一次修改时间 */
-    public static final String PROP_MODIFIEDTIME = "modifiedTime";
+    public static final String PROP_MODIFIEDTIME = "modified_time";
+    public static final String DO_PROP_MODIFIEDTIME = "modifiedTime";
 
     /** 最后一个修改人 */
     public static final String PROP_MODIFIER = "modifier";

+ 20 - 13
fm-parent/pom.xml

@@ -26,9 +26,7 @@
     <properties>
         <fm.version>3.0.0</fm.version>
         <platform.version>1.0.0</platform.version>
-        <mybatis.version>3.4.6</mybatis.version>
-        <mybatis-spring.version>1.3.2</mybatis-spring.version>
-        <mybatis.springboot.version>1.3.2</mybatis.springboot.version>
+        <mybatis-plus.version>3.3.1</mybatis-plus.version>
         <tomcat-jdbc.version>9.0.31</tomcat-jdbc.version>
         <HikariCP.version>3.2.0</HikariCP.version>
         <mysql.version>8.0.15</mysql.version>
@@ -36,6 +34,8 @@
         <spring.version>5.1.15.RELEASE</spring.version>
         <spring-data.version>2.1.17.RELEASE</spring-data.version>
         <spring-data-jpa.version>2.0.11.RELEASE</spring-data-jpa.version>
+        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <druid-spring-boot-starter.version>1.1.22</druid-spring-boot-starter.version>
     </properties>
 
     <dependencyManagement>
@@ -70,21 +70,28 @@
                 <artifactId>integrated-config-client</artifactId>
                 <version>${platform.version}</version>
             </dependency>
-            <!-- 以下是mybatis版本管理 -->
+            <!-- mybatis plus -->
             <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>${mybatis.version}</version>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
             </dependency>
+            <!-- mapstruct 优雅的进行bean与dto的转换 -->
             <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>${mybatis-spring.version}</version>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct-jdk8</artifactId>
+                <version>${mapstruct.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${mybatis.springboot.version}</version>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct-processor</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+            <!-- alibaba druid -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>${druid-spring-boot-starter.version}</version>
             </dependency>
             <!-- 以下是数据库连接池版本管理,建议使用provided方式引入-->
             <dependency>