-
+
diff --git a/codegenerator1.png b/codegenerator1.png
index ad0fdbc..6d565e9 100644
Binary files a/codegenerator1.png and b/codegenerator1.png differ
diff --git a/codegenerator2.png b/codegenerator2.png
index 9e447a9..3cd1cc4 100644
Binary files a/codegenerator2.png and b/codegenerator2.png differ
diff --git a/codegenerator3.png b/codegenerator3.png
index 38fa897..ffbcfc5 100644
Binary files a/codegenerator3.png and b/codegenerator3.png differ
diff --git a/codegenerator4.png b/codegenerator4.png
index e1d23e4..12c363b 100644
Binary files a/codegenerator4.png and b/codegenerator4.png differ
diff --git a/donate.jpg b/donate.jpg
deleted file mode 100644
index 08c3a13..0000000
Binary files a/donate.jpg and /dev/null differ
diff --git a/donate.png b/donate.png
new file mode 100644
index 0000000..4a83cfc
Binary files /dev/null and b/donate.png differ
diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
index 1ab4003..a9e7be2 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
@@ -1,20 +1,20 @@
-package com.softdev.system.generator.config;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.softdev.system.generator.entity.ReturnT;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@ControllerAdvice
-public class GlobalDefaultExceptionHandler {
-
- @ExceptionHandler(Exception.class)
- @ResponseBody
- public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
- e.printStackTrace();
- return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage());
- }
-
-}
+package com.softdev.system.generator.config;
+
+import com.softdev.system.generator.entity.ReturnT;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class GlobalDefaultExceptionHandler {
+
+ @ExceptionHandler(Exception.class)
+ @ResponseBody
+ public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
+ e.printStackTrace();
+ return ReturnT.ERROR(e.getMessage());
+ }
+
+}
diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java
index 1ad7c20..4a822f5 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java
@@ -1,15 +1,11 @@
package com.softdev.system.generator.controller;
-import com.alibaba.fastjson.JSON;
import com.softdev.system.generator.entity.ClassInfo;
import com.softdev.system.generator.entity.ParamInfo;
import com.softdev.system.generator.entity.ReturnT;
import com.softdev.system.generator.service.GeneratorService;
-import com.softdev.system.generator.util.CodeGenerateException;
import com.softdev.system.generator.util.TableParseUtil;
-import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -39,49 +34,41 @@ public class IndexController {
@PostMapping("/genCode")
@ResponseBody
- public ReturnT{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd')}}
"},
+ {title: '修改时间', sort: true,templet: "{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd')}}
"},
+ */
+ {title: '操作', minWidth: 400, templet: '#currentTableBar', fixed: "right", align: "center"}
]],
- limits: [10, 20, 50 , 100],
- limit: 10,
+ limits: [20 , 50 , 100],
+ limit: 20,
page: true
});
var result;
- // 监听搜索操作
+ /**
+ * submit(data-search-btn):监听搜索操作
+ */
form.on('submit(data-search-btn)', function (data) {
result = JSON.stringify(data.field);
- // layer.alert(result, {
- // title: '最终的搜索信息'
- // });
//执行搜索重载
table.reload('currentTableId', {
@@ -113,51 +124,54 @@
return false;
});
+
var searchBtn = $("#searchBtn");
- // 监听添加操作
- $(".data-add-btn").on("click", function () {
- var index = layer.open({
- title: '添加${classInfo.classComment}',
- type: 2,
- shade: 0.2,
- maxmin:true,
- shadeClose: true,
- area: ['800px', '500px'],
- content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id=0',
- });
- layer.full(index);
- return false;
- });
-
- // 监听删除操作
- $(".data-delete-btn").on("click", function () {
- var checkStatus = table.checkStatus('currentTableId')
- , data = checkStatus.data;
- layer.alert(JSON.stringify(data));
- });
-
- //监听表格复选框选择
- table.on('checkbox(currentTableFilter)', function (obj) {
- console.log(obj)
- });
-
- //监听表格编辑删除等功能按钮
- table.on('tool(currentTableFilter)', function (obj) {
- var data = obj.data;
- if (obj.event === 'edit') {
+ /**
+ * toolbar监听事件:表格添加按钮
+ */
+ table.on('toolbar(currentTableFilter)', function (obj) {
+ if (obj.event === 'add') {
var index = layer.open({
- title: '编辑${classInfo.classComment}',
+ title: '添加',
type: 2,
shade: 0.2,
maxmin:true,
shadeClose: true,
- area: ['800px', '500px'],
+ area: ['1000px', '700px'],
+ content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id=0',
+ });
+ return false;
+ }else if(obj.event === 'del') {
+ var checkStatus = table.checkStatus('currentTableId')
+ , data = checkStatus.data;
+ layer.alert(JSON.stringify(data));
+ }
+ });
+ /**
+ * checkbox(currentTableFilter):表格复选框选择
+ */
+ table.on('checkbox(currentTableFilter)', function (obj) {
+ //console.log(obj)
+ });
+
+ /**
+ * tool监听事件:表格编辑删除等功能按钮
+ */
+ table.on('tool(currentTableFilter)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'edit') {
+ var index = layer.open({
+ title: '编辑',
+ type: 2,
+ shade: 0.2,
+ maxmin:true,
+ shadeClose: true,
+ area: ['1000px', '700px'],
content: '￥{request.contextPath}/${classInfo.className?uncap_first}/edit?id='+obj.data.${classInfo.className?uncap_first}Id,
});
- layer.full(index);
return false;
} else if (obj.event === 'delete') {
- layer.confirm('真的删除行么', function (index) {
+ layer.confirm('确认删除该记录吗？', function (index) {
$.ajax({
type: 'POST',
url: "￥{request.contextPath}/${classInfo.className?uncap_first}/delete",
@@ -169,13 +183,40 @@
});
} else {
layer.msg(responseData.msg, function () {
- //window.location = '/index.html';
});
}
}
});
layer.close(index);
});
+ }else if (obj.event === 'publish') {
+ layer.confirm('确定要发布吗？', function (index) {
+ $.ajax({
+ type: 'POST',
+ url: "￥{request.contextPath}/${classInfo.className?uncap_first}/publish",
+ data:{"id":obj.data.${classInfo.className?uncap_first}Id,"status":"1"},
+ success: function (responseData) {
+ searchBtn.click();
+ layer.msg(responseData.msg, function () {
+ });
+ }
+ });
+ layer.close(index);
+ });
+ }else if (obj.event === 'unpublish') {
+ layer.confirm('确定要停止吗？', function (index) {
+ $.ajax({
+ type: 'POST',
+ url: "￥{request.contextPath}/${classInfo.className?uncap_first}/publish",
+ data:{"id":obj.data.${classInfo.className?uncap_first}Id,"status":"0"},
+ success: function (responseData) {
+ searchBtn.click();
+ layer.msg(responseData.msg, function () {
+ });
+ }
+ });
+ layer.close(index);
+ });
}
});
diff --git a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
new file mode 100644
index 0000000..b293944
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/util/beanutil.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 classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}();
+
+
+<#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 classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.fieldName?cap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.columnName}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+
+
+<#list classInfo.fieldList as fieldItem>
+map.put("${fieldItem.fieldComment}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+map.put("${fieldItem.fieldName?cap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+
+
+
diff --git a/generator-web/src/main/resources/templates/code-generator/util/json.ftl b/generator-web/src/main/resources/templates/code-generator/util/json.ftl
index a0be13a..8de14f6 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/json.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/json.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>,
+ "${fieldItem.fieldName}":"${fieldItem.fieldComment}"<#if fieldItem_has_next>,
}
diff --git a/generator-web/src/main/resources/templates/code-generator/util/sql.ftl b/generator-web/src/main/resources/templates/code-generator/util/sql.ftl
new file mode 100644
index 0000000..848f6e8
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/util/sql.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>,
+
+ FROM
+ ${classInfo.tableName}
+ WHERE
+ <#list classInfo.fieldList as fieldItem >
+ <#if fieldItem_index != 0>AND ${fieldItem.columnName} = ''
+ ;
+
+
+<#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 classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+ INSERT INTO ${classInfo.tableName} ( <#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>, )
+ VALUES
+ (
+ <#list classInfo.fieldList as fieldItem >
+ ''<#if fieldItem_has_next>,
+
+ );
+
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+ UPDATE ${classInfo.tableName}
+ SET
+ <#list classInfo.fieldList as fieldItem >
+ ${fieldItem.columnName} = ''<#if fieldItem_has_next>,
+
+ WHERE
+ <#list classInfo.fieldList as fieldItem >
+ ${fieldItem.columnName} = ''<#if fieldItem_has_next>,
+ ;
+
+
+
+
+<#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>,
+ ;
+
diff --git a/generator-web/src/main/resources/templates/code-generator/util/util.ftl b/generator-web/src/main/resources/templates/code-generator/util/util.ftl
deleted file mode 100644
index 13da0ab..0000000
--- a/generator-web/src/main/resources/templates/code-generator/util/util.ftl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
-* ${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 classInfo.fieldList as fieldItem>
-// ${fieldItem.fieldComment}
-${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}();
-
-
-<#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}(););
-
-
diff --git a/generator-web/src/main/resources/templates/code-generator/util/xml.ftl b/generator-web/src/main/resources/templates/code-generator/util/xml.ftl
index d815657..3959cfc 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/xml.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/xml.ftl
@@ -5,7 +5,7 @@
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<${classInfo.className}>
<#list classInfo.fieldList as fieldItem>
- <${fieldItem.fieldName}>
+ <${fieldItem.fieldName}>${fieldItem.fieldComment}
diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl
index 7eecedc..c50975f 100644
--- a/generator-web/src/main/resources/templates/index.ftl
+++ b/generator-web/src/main/resources/templates/index.ftl
@@ -154,7 +154,7 @@
*/
function donate(){
if($("#donate").attr("show")=="no"){
- $("#donate").html('
');
+ $("#donate").html('
');
$("#donate").attr("show","yes");
}else{
$("#donate").html('谢谢赞赏！
'); @@ -206,7 +206,7 @@ BeJSON在线工具站 @@ -217,7 +217,9 @@Spring Boot Code Generator!
- √基于SpringBoot2+Freemarker的代码生成器，√以释放双手为目的，√支持mysql/oracle/pgsql三大数据库，
+ √基于SpringBoot2+Freemarker的代码生成器
+ √以解放双手为目的，减少大量重复的CRUD工作
+ √支持mysql/oracle/pgsql三大数据库
√用DDL-SQL语句生成JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL相关代码。
如果发现有SQL语句不能识别，请留言，同时欢迎大家提PR和赞赏，谢谢！查看版本
作者名称
-
+
返回封装
-
+
包名路径
@@ -243,9 +245,10 @@
tinyint转换类型
@@ -279,7 +282,7 @@