🎨 对于无数据源的模板，也需要填充 currentTime 属性

ballcat-projects · Jun 19, 2024 · fe65ba3 · fe65ba3
1 parent 6274b5b
commit fe65ba3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/helper/GenerateHelper.java b/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/helper/GenerateHelper.java
@@ -1,5 +1,9 @@
 package com.hccake.ballcat.codegen.helper;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -20,16 +24,10 @@
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 代码生成器 工具类
  *
- * @author hccake
- * @date 2018-07-30
+ * @author hccake 2018-07-30
  */
 @Slf4j
 @Component
@@ -43,15 +41,19 @@ public class GenerateHelper {
 	public Map<String, Object> getContext(TableDetails tableDetails, String tablePrefix, String templateGroupKey,
 			Map<String, String> customProperties) {
 		Map<String, Object> context;
+
+		GenerateProperties generateProperties;
 		if (tableDetails != null) {
 			// 根据表信息和字段信息获取对应的配置属性
-			GenerateProperties generateProperties = getGenerateProperties(tableDetails, tablePrefix, templateGroupKey);
-			// 转换generateProperties为map，模板数据
-			context = BeanUtil.beanToMap(generateProperties);
+			generateProperties = genGeneratePropertiesFormTable(tableDetails, tablePrefix, templateGroupKey);
 		}
 		else {
-			context = new HashMap<>(customProperties.size());
+			generateProperties = new GenerateProperties();
+			generateProperties.setCurrentTime(DateUtil.now());
 		}
+
+		// 转换generateProperties为map，模板数据
+		context = BeanUtil.beanToMap(generateProperties);
 		// 追加用户自定义属性
 		context.putAll(customProperties);
 		return context;
@@ -63,7 +65,7 @@ public Map<String, Object> getContext(TableDetails tableDetails, String tablePre
 	 * @param tablePrefix 表前缀
 	 * @return GenerateProperties
 	 */
-	private GenerateProperties getGenerateProperties(TableDetails tableDetails, String tablePrefix,
+	private GenerateProperties genGeneratePropertiesFormTable(TableDetails tableDetails, String tablePrefix,
 			String templateGroupKey) {
 		// 表信息
 		GenerateProperties generateProperties = new GenerateProperties();

diff --git a/ballcat-codegen-backend/src/main/resources/logback-spring.xml b/ballcat-codegen-backend/src/main/resources/logback-spring.xml
@@ -98,4 +98,6 @@
 			<appender-ref ref="ERROR_FILE"/>
 		</root>
 	</springProfile>
+
+	<logger name="com.zaxxer.hikari.pool" level="INFO"/>
 </configuration>