1.一些fix,关于封装工具类以及layui模板优化等.<br> 2.优化表备注的获取逻辑.<br> 3.生成时间格式改为yyyy-MM-dd,移除具体的时间,只保留日期

Author: moshowgame

README.md

@@ -14,9 +14,9 @@
 # Advantage 
 - 支持DDL SQL/INSERT SQL/SIMPLE JSON生成模式
 - 自动记忆最近生成的内容，最多保留9个
-- 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替)
 - 提供众多通用模板，易于使用，复制粘贴加简单修改即可完成CRUD操作
-
+- 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替)
+- 根据comment=(mysql)或者comment on table(pgsql/oracle)生成类名注释
 
 # Url
 
@@ -33,6 +33,7 @@
 
 |更新日期|更新内容|
 |----|----|
+|20200525|1.一些fix,关于封装工具类以及layui模板优化等.<br> 2.优化表备注的获取逻辑.<br> 3.生成时间格式改为yyyy-MM-dd,移除具体的时间,只保留日期|
 |20200522|1.新增insert-sql模式,支持对"insert into table (xxx) values (xxx)"语句进行处理,生成java代码(感谢三叔的建议).|
 |20200517|1.代码重构！异常处理优化,Freemarker相关工具类优化,简化模板生成部分,通过template.json来配置需要生成的模板,不需要配置java文件.<br> 2.修复包含comment关键字时注释无法识别的问题.(感谢@1nchaos的反馈).<br> 3.赞赏优化,感谢大家的赞赏.<br> 4.新增mapper2(Mybatis-Annotation模板)(感谢@baisi525和@CHKEGit的建议).|
 |20200503|1.优化对特殊字符的处理,对于包含#和$等特殊字符的,在模板使用井和￥代替便可,escapeString方法会自动处理.<br> 2.优化mybatisplus实体类相关(感谢@chunchengmeigui的反馈).<br> 3.修优化对所有类型的判断(感谢@cnlw的反馈).<br> 4.移除swagger-entity,该功能已经包含在‘swagger-ui’的下拉选项中  <br> 5.升级hutool和lombok版本|

generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java

@@ -14,7 +14,7 @@ public class GlobalDefaultExceptionHandler {
 	@ResponseBody
 	public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
 		e.printStackTrace();
-		return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage());
+		return ReturnT.ERROR(e.getMessage());
 	}
 
 }

generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java

@@ -34,10 +34,10 @@ public String index() {
 
     @PostMapping("/genCode")
     @ResponseBody
-    public ReturnT<Map<String, String>> codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception {
+    public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception {
 
         if (paramInfo.getTableSql().trim().length()<1) {
-            return new ReturnT<>(ReturnT.FAIL_CODE, "表结构信息不可为空");
+            return ReturnT.ERROR("表结构信息不可为空");
         }
 
         //1.Parse Table Structure 表结构解析
@@ -68,7 +68,7 @@ public ReturnT<Map<String, String>> codeGenerate(@RequestBody ParamInfo paramInf
         //3.generate the code by freemarker template and param . Freemarker根据参数和模板生成代码
         Map<String, String> result = generatorService.getResultByParams(params);
 
-        return new ReturnT<>(result);
+        return ReturnT.SUCCESS(result);
     }
 
 }

generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java

@@ -5,29 +5,61 @@
 import java.io.Serializable;
 
 /**
- * common return
- * @author xuxueli 2015-12-4 16:32:31
+ * common returnT:公共返回封装类
+ * @author zhengkai.blog.csdn.net
  */
 @Data
-public class ReturnT<T> implements Serializable {
+public class ReturnT implements Serializable {
 	public static final long serialVersionUID = 42L;
 
 	public static final int SUCCESS_CODE = 200;
 	public static final int FAIL_CODE = 500;
-	public static final ReturnT<String> SUCCESS = new ReturnT<>(null);
-	public static final ReturnT<String> FAIL = new ReturnT<>(FAIL_CODE, null);
-	
+	public static final int PAGE_CODE = 0;
+	public static final String OBJECT_NOT_FOUND = "找不到该对象";
+	public static final String OPERATION_SUCCESS = "操作成功";
+
 	private int code;
 	private String msg;
-	private T data;
-	
+	private Object data;
+	private int count;
+
 	public ReturnT(int code, String msg) {
 		this.code = code;
 		this.msg = msg;
 	}
-	public ReturnT(T data) {
+	public ReturnT(int code, String msg,Object data) {
+		this.code = code;
+		this.msg = msg;
+		this.data = data;
+	}
+	public ReturnT(Object data) {
 		this.code = SUCCESS_CODE;
 		this.data = data;
 	}
-	
+	public ReturnT( Object data , int count ) {
+		this.code = PAGE_CODE;
+		this.data = data;
+		this.count = count;
+	}
+	public static ReturnT PAGE( Object data , int count){
+		return new ReturnT(data,count);
+	}
+	public static ReturnT PAGE( Object data , long count){
+		return new ReturnT(data,Integer.parseInt(count+""));
+	}
+	public static ReturnT SUCCESS(){
+		return new ReturnT(SUCCESS_CODE,OPERATION_SUCCESS);
+	}
+	public static ReturnT SUCCESS(String msg){
+		return new ReturnT(SUCCESS_CODE,msg);
+	}
+	public static ReturnT SUCCESS(Object data){
+		return new ReturnT(data);
+	}
+	public static ReturnT ERROR(String msg){
+		return new ReturnT(FAIL_CODE,msg);
+	}
+	public static ReturnT ERROR(){
+		return new ReturnT(FAIL_CODE,OBJECT_NOT_FOUND);
+	}
 }

generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java

@@ -80,28 +80,17 @@ public static ClassInfo processTableIntoClassInfo(ParamInfo paramInfo)
         // class Comment
         String classComment = null;
         //mysql是comment=,pgsql/oracle是comment on table,
-        if (tableSql.contains("comment=")) {
-            String classCommentTmp = tableSql.substring(tableSql.lastIndexOf("comment=")+8).replaceAll("`","").trim();
-            if (classCommentTmp.indexOf(" ")!=classCommentTmp.lastIndexOf(" ")) {
-                classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf(" ")+1, classCommentTmp.lastIndexOf(" "));
-            }
-            if (classCommentTmp!=null && classCommentTmp.trim().length()>0) {
-                classComment = classCommentTmp;
-            }else{
-                //修复表备注为空问题
-                classComment = className;
-            }
-        }else if(tableSql.contains("comment on table")) {
-            //COMMENT ON TABLE CT_BAS_FEETYPE IS 'CT_BAS_FEETYPE';
-            String classCommentTmp = tableSql.substring(tableSql.lastIndexOf("comment on table")+17).trim();
-            //证明这是一个常规的COMMENT ON TABLE  xxx IS 'xxxx'
+        //2020-05-25 优化表备注的获取逻辑
+        if (tableSql.contains("comment=")||tableSql.contains("comment on table")) {
+            String classCommentTmp = (tableSql.contains("comment="))?
+                    tableSql.substring(tableSql.lastIndexOf("comment=")+8).trim():tableSql.substring(tableSql.lastIndexOf("comment on table")+17).trim();
             if (classCommentTmp.contains("`")) {
                 classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf("`")+1);
                 classCommentTmp = classCommentTmp.substring(0,classCommentTmp.indexOf("`"));
                 classComment = classCommentTmp;
             }else{
                 //非常规的没法分析
-                classComment = tableName;
+                classComment = className;
             }
         }else{
             //修复表备注为空问题

generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl

@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
- * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ * @date ${.now?string('yyyy-MM-dd')}
  */
 @RestController
 @RequestMapping("/${classInfo.className?uncap_first}")

generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
- * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ * @date ${.now?string('yyyy-MM-dd')}
  */
 @Data<#if swagger?exists && swagger==true>
 @ApiModel("${classInfo.classComment}")</#if>

generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl

@@ -4,7 +4,7 @@ import java.util.List;
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
- * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ * @date ${.now?string('yyyy-MM-dd')}
  */
 public interface I${classInfo.className}DAO {
 

generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
- * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ * @date ${.now?string('yyyy-MM-dd')}
  */
 @Repository
 public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao{

generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl

@@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
- * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ * @date ${.now?string('yyyy-MM-dd')}
  */
 @Entity
 @Data