生成代码BUG修改

jjt-generator/src/main/java/com/jjt/generator/util/GenUtils.java

@@ -150,7 +150,12 @@ public class GenUtils {
     public static String getBusinessName(String tableName) {
         int lastIndex = tableName.lastIndexOf("_");
         int nameLength = tableName.length();
-        return StringUtils.substring(tableName, lastIndex + 1, nameLength);
+        String digit = "[0-9]";
+        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
+        if (StringUtils.isAllUpperCase(businessName.replaceAll(digit, ""))) {
+            businessName=businessName.toLowerCase();
+        }
+        return businessName;
     }
 
     /**

jjt-generator/src/main/resources/vm/java/domain.java.vm

@@ -6,6 +6,7 @@ import ${import};
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.annotation.Excel;
@@ -27,6 +28,7 @@ import com.jjt.common.core.domain.TreeEntity;
 #set($Entity="TreeEntity")
 #end
 @ApiModel(value = "${ClassName}", description = "${functionName}")
+@Data
 public class ${ClassName} extends ${Entity}{
     private static final long serialVersionUID = 1L;
 
@@ -44,7 +46,7 @@ public class ${ClassName} extends ${Entity}{
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
     @Excel(name = "${comment}")
@@ -62,51 +64,51 @@ public class ${ClassName} extends ${Entity}{
     private List<${subClassName}> ${subclassName}List;
 
 #end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField)
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}()
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
+###foreach ($column in $columns)
+###if(!$table.isSuperColumn($column.javaField))
+###if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+###set($AttrName=$column.javaField)
+###else
+###set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+###end
+##    public void set${AttrName}($column.javaType $column.javaField)
+##    {
+##        this.$column.javaField = $column.javaField;
+##    }
+##
+##    public $column.javaType get${AttrName}()
+##    {
+##        return $column.javaField;
+##    }
+###end
+###end
+##
+###if($table.sub)
+##    public List<${subClassName}> get${subClassName}List()
+##    {
+##        return ${subclassName}List;
+##    }
+##
+##    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
+##    {
+##        this.${subclassName}List = ${subclassName}List;
+##    }
+##
+###end
+##    @Override
+##    public String toString() {
+##        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+###foreach ($column in $columns)
+###if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+###set($AttrName=$column.javaField)
+###else
+###set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+###end
+##            .append("${column.javaField}", get${AttrName}())
+###end
+###if($table.sub)
+##            .append("${subclassName}List", get${subClassName}List())
+###end
+##            .toString();
+##    }
 }