优化Util下的BeanUtil，支持更多map.put的操作。整合CRUD模板到SQL(CRUD)模板。

Author: moshowgame

README.md

@@ -17,6 +17,8 @@
 - 提供众多通用模板，易于使用，复制粘贴加简单修改即可完成CRUD操作
 - 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替)
 - 根据comment=(mysql)或者comment on table(pgsql/oracle)生成类名注释
+- BeanUtil提供一些基本对象的使用方法供COPY
+
 
 # Url
 
@@ -33,6 +35,7 @@
 
 |更新日期|更新内容|
 |----|----|
+|20200628|优化Util下的BeanUtil，支持更多map.put的操作。整合CRUD模板到SQL(CRUD)模板。|
 |20200621|修复FreemarkerUtil的Path问题导致JAR包运行时无法获取template的问题。|
 |20200525|1.一些fix,关于封装工具类以及layui模板优化等.<br> 2.优化表备注的获取逻辑.<br> 3.生成时间格式改为yyyy-MM-dd,移除具体的时间,只保留日期|
 |20200522|1.新增insert-sql模式,支持对"insert into table (xxx) values (xxx)"语句进行处理,生成java代码(感谢三叔的建议).|

generator-web/src/main/resources/template.json

@@ -139,9 +139,9 @@
   },
   {
     "id": "70",
-    "name": "util",
+    "name": "beanutil",
     "group": "util",
-    "description": "util"
+    "description": "beanutil"
   },
   {
     "id": "71",
@@ -156,27 +156,9 @@
     "description": "xml"
   },
   {
-    "id": "80",
-    "name": "select",
-    "group": "sql",
-    "description": "select"
-  },
-  {
-    "id": "81",
-    "name": "insert",
-    "group": "sql",
-    "description": "insert"
-  },
-  {
-    "id": "82",
-    "name": "update",
-    "group": "sql",
-    "description": "update"
-  },
-  {
-    "id": "83",
-    "name": "delete",
-    "group": "sql",
-    "description": "delete"
+    "id": "73",
+    "name": "sql",
+    "group": "util",
+    "description": "sql"
   }
 ]

generator-web/src/main/resources/templates/code-generator/sql/delete.ftl

@@ -0,0 +1,41 @@
+/**
+* ${classInfo.classComment}对象Get Set
+* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+*/
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+${fieldItem.fieldClass} ${fieldItem.fieldName} = ${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}();
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}();
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}(${classInfo.className?uncap_first}2.get${fieldItem.fieldName?cap_first}());
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.fieldName?cap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.columnName}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+map.put("${fieldItem.fieldComment}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+</#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.fieldName?cap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+</#list>
+
+</#if>

generator-web/src/main/resources/templates/code-generator/sql/insert.ftl

@@ -1,7 +1,7 @@
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
 {
 <#list classInfo.fieldList as fieldItem>
- "${fieldItem.fieldName}":""<#if fieldItem_has_next>,</#if>
+ "${fieldItem.fieldName}":"${fieldItem.fieldComment}"<#if fieldItem_has_next>,</#if>
 </#list>
 }
 </#if>

generator-web/src/main/resources/templates/code-generator/sql/select.ftl

@@ -0,0 +1,58 @@
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    SELECT
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
+    </#list>
+    FROM
+    ${classInfo.tableName}
+    WHERE
+    <#list classInfo.fieldList as fieldItem >
+        <#if fieldItem_index != 0>AND </#if>${fieldItem.columnName} = ''
+    </#list>;
+</#if>
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    SELECT
+        *
+    FROM
+    ${classInfo.tableName} t1
+    LEFT JOIN xxx t2
+    ON t1.${classInfo.tableName}_id=t2.${classInfo.tableName}_id
+    WHERE 1=1;
+</#if>
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    INSERT INTO ${classInfo.tableName} ( <#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list> )
+    VALUES
+    (
+    <#list classInfo.fieldList as fieldItem >
+        ''<#if fieldItem_has_next>,</#if>
+    </#list>
+    );
+</#if>
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    UPDATE ${classInfo.tableName}
+    SET
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>
+    WHERE
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>;
+</#if>
+
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    DELETE
+    FROM
+    ${classInfo.tableName}
+    WHERE
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>;
+</#if>