bug修复

zd-model/src/main/java/com/zd/model/enums/CodeToValueEnumTypeHandler.java

@@ -1,75 +1,75 @@
-//package com.zd.model.enums;
-//
-//import org.apache.ibatis.type.BaseTypeHandler;
-//import org.apache.ibatis.type.JdbcType;
-//import org.apache.ibatis.type.MappedTypes;
-//
-//import java.sql.CallableStatement;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//
-///**
-// * code 作为值的转换器
-// *
-// * @Author: zhoupan
-// * @Date: 2021/09/10/10:29
-// * @Description:
-// */
-//@MappedTypes({BaseEnum.class})
-//public class CodeToValueEnumTypeHandler<E extends Enum<?> & BaseEnum> extends BaseTypeHandler<BaseEnum> {
-//
-//    private Class<E> type;
-//
-//    public CodeToValueEnumTypeHandler(Class<E> type) {
-//        if (type == null) {
-//            throw new IllegalArgumentException("要转换的枚举类不能为空");
-//        }
-//        this.type = type;
-//    }
-//
-//
-//    @Override
-//    public void setNonNullParameter(PreparedStatement preparedStatement, int i, BaseEnum baseEnum, JdbcType jdbcType) throws SQLException {
-//        if (baseEnum == null) {
-//            preparedStatement.setObject(i, null, jdbcType.TYPE_CODE);
-//            return;
-//        }
-//        if (jdbcType == null) {
-//            preparedStatement.setObject(i, baseEnum.getDictKey());
-//            return;
-//        }
-//
-//        preparedStatement.setObject(i, baseEnum.getDictKey(), jdbcType.TYPE_CODE);
-//    }
-//
-//    @Override
-//    public BaseEnum getNullableResult(ResultSet resultSet, String s) throws SQLException {
-//        Object code = resultSet.getObject(s);
-//        if (resultSet.wasNull()) {
-//            return null;
-//        }
-//        return BaseEnum.valueOfEnum(type, code);
-//
-//    }
-//
-//    @Override
-//    public BaseEnum getNullableResult(ResultSet resultSet, int i) throws SQLException {
-//        Object code = resultSet.getObject(i);
-//        if (resultSet.wasNull()) {
-//            return null;
-//        }
-//
-//        return BaseEnum.valueOfEnum(type, code);
-//    }
-//
-//    @Override
-//    public BaseEnum getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
-//        Object code = callableStatement.getObject(i);
-//        if (callableStatement.wasNull()) {
-//            return null;
-//        }
-//
-//        return BaseEnum.valueOfEnum(type, code);
-//    }
-//}
+package com.zd.model.enums;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedTypes;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * code 作为值的转换器
+ *
+ * @Author: zhoupan
+ * @Date: 2021/09/10/10:29
+ * @Description:
+ */
+@MappedTypes({BaseEnum.class})
+public class CodeToValueEnumTypeHandler<E extends Enum<?> & BaseEnum> extends BaseTypeHandler<BaseEnum> {
+
+    private Class<E> type;
+
+    public CodeToValueEnumTypeHandler(Class<E> type) {
+        if (type == null) {
+            throw new IllegalArgumentException("要转换的枚举类不能为空");
+        }
+        this.type = type;
+    }
+
+
+    @Override
+    public void setNonNullParameter(PreparedStatement preparedStatement, int i, BaseEnum baseEnum, JdbcType jdbcType) throws SQLException {
+        if (baseEnum == null) {
+            preparedStatement.setObject(i, null, jdbcType.TYPE_CODE);
+            return;
+        }
+        if (jdbcType == null) {
+            preparedStatement.setObject(i, baseEnum.getDictKey());
+            return;
+        }
+
+        preparedStatement.setObject(i, baseEnum.getDictKey(), jdbcType.TYPE_CODE);
+    }
+
+    @Override
+    public BaseEnum getNullableResult(ResultSet resultSet, String s) throws SQLException {
+        Object code = resultSet.getObject(s);
+        if (resultSet.wasNull()) {
+            return null;
+        }
+        return BaseEnum.valueOfEnum(type, code);
+
+    }
+
+    @Override
+    public BaseEnum getNullableResult(ResultSet resultSet, int i) throws SQLException {
+        Object code = resultSet.getObject(i);
+        if (resultSet.wasNull()) {
+            return null;
+        }
+
+        return BaseEnum.valueOfEnum(type, code);
+    }
+
+    @Override
+    public BaseEnum getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
+        Object code = callableStatement.getObject(i);
+        if (callableStatement.wasNull()) {
+            return null;
+        }
+
+        return BaseEnum.valueOfEnum(type, code);
+    }
+}

zd-modules/zd-airbottle/src/main/resources/bootstrap.yml

@@ -7,8 +7,9 @@ mybatis:
   typeAliasesPackage: com.zd.airbottle
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
     # Mybatis开启驼峰映射
-    mapUnderscoreToCamelCase: true
+    mapUnderscoreToCamelCase: true

zd-modules/zd-algorithm/src/main/resources/bootstrap.yml

@@ -14,6 +14,7 @@ mybatis:
   typeAliasesPackage: com.zd.alg
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
@@ -35,7 +36,7 @@ sys:
     inbound: true
     ## 默认为true 不需要发送则关闭
     outbound: true
-    
+
 file:
   path: /home/AIPIC
 
@@ -47,4 +48,4 @@ swagger-ui:
 version:
   version: "@project.version@"
   description: "@project.description@"
-  artifact-id: "@project.artifactId@"
+  artifact-id: "@project.artifactId@"

zd-modules/zd-base/src/main/resources/bootstrap.yml

@@ -29,8 +29,9 @@ mybatis:
   typeAliasesPackage: com.zd.base
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
     # Mybatis开启驼峰映射
-    mapUnderscoreToCamelCase: true
+    mapUnderscoreToCamelCase: true

zd-modules/zd-chemical/src/main/resources/bootstrap.yml

@@ -8,9 +8,10 @@ mybatis:
   typeAliasesPackage: com.zd.chemical
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   # 配置项
   configuration:
     # 配置日志打印
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # Mybatis开启驼峰映射
-    mapUnderscoreToCamelCase: true
+    mapUnderscoreToCamelCase: true

zd-modules/zd-exam/src/main/resources/bootstrap.yml

@@ -9,9 +9,10 @@ mybatis:
   typeAliasesPackage: com.zd.exam
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   # 配置项
   configuration:
     # 配置日志打印
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # Mybatis开启驼峰映射
-    mapUnderscoreToCamelCase: true
+    mapUnderscoreToCamelCase: true

zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml

@@ -8,6 +8,7 @@ mybatis:
   typeAliasesPackage: com.zd.laboratory
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   # 配置项
   configuration:
     # 配置日志打印

zd-modules/zd-modules-system/src/main/resources/bootstrap.yml

@@ -8,6 +8,7 @@ mybatis:
   typeAliasesPackage: com.zd.system
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath:mapper/**/*.xml
+  type-handlers-package: com.zd.model.enums
   # 配置项
   configuration:
     # 配置日志打印