From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
index bc17faa..403ea53 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
@@ -1,22 +1,27 @@
package com.ruoyi.common.core.mybatisplus.methods;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.ruoyi.common.utils.StringUtils;
import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
import org.apache.ibatis.executor.keygen.KeyGenerator;
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;
+import java.util.List;
+
/**
- * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 鏃犺鏁版嵁搴撻粯璁ゅ�� )
+ * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 )
*
* @author Lion Li
*/
public class InsertAll extends AbstractMethod {
+
+ private final static String[] FILL_PROPERTY = {"createTime", "createBy", "updateTime", "updateBy"};
@Override
public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
@@ -28,7 +33,7 @@
String keyProperty = null;
String keyColumn = null;
// 琛ㄥ寘鍚富閿鐞嗛�昏緫,濡傛灉涓嶅寘鍚富閿綋鏅�氬瓧娈靛鐞�
- if (StrUtil.isNotBlank(tableInfo.getKeyProperty())) {
+ if (StringUtils.isNotBlank(tableInfo.getKeyProperty())) {
if (tableInfo.getIdType() == IdType.AUTO) {
/** 鑷涓婚敭 */
keyGenerator = new Jdbc3KeyGenerator();
@@ -49,7 +54,7 @@
private String prepareFieldSql(TableInfo tableInfo) {
StringBuilder fieldSql = new StringBuilder();
- if (StrUtil.isNotBlank(tableInfo.getKeyColumn())) {
+ if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
fieldSql.append(tableInfo.getKeyColumn()).append(",");
}
tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
@@ -62,11 +67,33 @@
private String prepareValuesSqlForMysqlBatch(TableInfo tableInfo) {
final StringBuilder valueSql = new StringBuilder();
valueSql.append("<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" separator=\"),(\" close=\")\">");
- if (StrUtil.isNotBlank(tableInfo.getKeyColumn())) {
- valueSql.append("#{item.").append(tableInfo.getKeyProperty()).append("},");
+ if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
+ valueSql.append("\n#{item.").append(tableInfo.getKeyProperty()).append("},\n");
}
- tableInfo.getFieldList().forEach(x -> valueSql.append("#{item.").append(x.getProperty()).append("},"));
- valueSql.delete(valueSql.length() - 1, valueSql.length());
+ List<TableFieldInfo> fieldList = tableInfo.getFieldList();
+ int last = fieldList.size() - 1;
+ for (int i = 0; i < fieldList.size(); i++) {
+ String property = fieldList.get(i).getProperty();
+ if (!StringUtils.equalsAny(property, FILL_PROPERTY)) {
+ valueSql.append("<if test=\"item.").append(property).append(" != null\">");
+ valueSql.append("#{item.").append(property).append("}");
+ if (i != last) {
+ valueSql.append(",");
+ }
+ valueSql.append("</if>");
+ valueSql.append("<if test=\"item.").append(property).append(" == null\">");
+ valueSql.append("DEFAULT");
+ if (i != last) {
+ valueSql.append(",");
+ }
+ valueSql.append("</if>");
+ } else {
+ valueSql.append("#{item.").append(property).append("}");
+ if (i != last) {
+ valueSql.append(",");
+ }
+ }
+ }
valueSql.append("</foreach>");
return valueSql.toString();
}
--
Gitblit v1.9.3