From 04d83232a7a74aa74573495ed6811f9484b52321 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 31 Jul 2024 07:45:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GeneratorServiceImpl.java    | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
index 50713e67..66d26dff 100644
--- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
@@ -140,18 +140,19 @@ public class GeneratorServiceImpl implements GeneratorService {
     /**
      * 创建默认字段配置
      *
-     * @param tableColumn 表字段元数据
+     * @param columnMetaData 表字段元数据
      * @return
      */
-    private GenFieldConfig createDefaultFieldConfig(ColumnMetaData tableColumn) {
+    private GenFieldConfig createDefaultFieldConfig(ColumnMetaData columnMetaData) {
         GenFieldConfig fieldConfig = new GenFieldConfig();
-        fieldConfig.setColumnName(tableColumn.getColumnName());
-        fieldConfig.setColumnType(tableColumn.getDataType());
-        fieldConfig.setFieldComment(tableColumn.getColumnComment());
-        fieldConfig.setFieldName(StrUtil.toCamelCase(tableColumn.getColumnName()));
-        fieldConfig.setIsRequired("YES".equals(tableColumn.getIsNullable()) ? 1 : 0);
+        fieldConfig.setColumnName(columnMetaData.getColumnName());
+        fieldConfig.setColumnType(columnMetaData.getDataType());
+        fieldConfig.setFieldComment(columnMetaData.getColumnComment());
+        fieldConfig.setFieldName(StrUtil.toCamelCase(columnMetaData.getColumnName()));
+        fieldConfig.setIsRequired("YES".equals(columnMetaData.getIsNullable()) ? 1 : 0);
         fieldConfig.setFormType(FormTypeEnum.INPUT);
         fieldConfig.setQueryType(QueryTypeEnum.EQ);
+        fieldConfig.setMaxLength(columnMetaData.getCharacterMaximumLength());
         return fieldConfig;
     }
 
@@ -316,13 +317,27 @@ public class GeneratorServiceImpl implements GeneratorService {
         bindMap.put("businessName", genConfig.getBusinessName());
         bindMap.put("fieldConfigs", fieldConfigs);
 
+        boolean hasLocalDateTime = false;
+        boolean hasBigDecimal = false;
+        boolean hasRequiredField = false;
+
         for (GenFieldConfig fieldConfig : fieldConfigs) {
-            bindMap.put("hasLocalDateTime", "LocalDateTime".equals(fieldConfig.getFieldType()));
-            bindMap.put("hasBigDecimal", "BigDecimal".equals(fieldConfig.getFieldType()));
-            bindMap.put("hasRequiredField", ObjectUtil.equals(fieldConfig.getIsRequired(), 1));
+            if ("LocalDateTime".equals(fieldConfig.getFieldType())) {
+                hasLocalDateTime = true;
+            }
+            if ("BigDecimal".equals(fieldConfig.getFieldType())) {
+                hasBigDecimal = true;
+            }
+            if (ObjectUtil.equals(fieldConfig.getIsRequired(), 1)) {
+                hasRequiredField = true;
+            }
             fieldConfig.setTsType(JavaTypeEnum.getTsTypeByJavaType(fieldConfig.getFieldType()));
         }
 
+        bindMap.put("hasLocalDateTime", hasLocalDateTime);
+        bindMap.put("hasBigDecimal", hasBigDecimal);
+        bindMap.put("hasRequiredField", hasRequiredField);
+
         TemplateEngine templateEngine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
         Template template = templateEngine.getTemplate(templateConfig.getTemplatePath());
         String content = template.render(bindMap);