From 28bcd9369c8270af5e1780c335a31b43d74d69b0 Mon Sep 17 00:00:00 2001
From: "yangjing2@mi-ya.com.cn" <yangjing2@mi-ya.com.cn>
Date: Sat, 7 Sep 2019 15:16:42 +0800
Subject: [PATCH] =?UTF-8?q?2019-09-08=20yj=20=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=B8=8B=E5=88=92=E7=BA=BF=E8=BD=AC=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/controller/IndexController.java      |  5 +++--
 .../system/generator/util/CodeGeneratorTool.java   |  4 ++--
 .../system/generator/util/TableParseUtil.java      | 14 ++++++++++----
 .../src/main/resources/templates/index.ftl         | 11 ++++++++++-
 4 files changed, 25 insertions(+), 9 deletions(-)

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 d5a256b..34810e5 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
@@ -39,7 +39,8 @@ public class IndexController {
                                                      //2019-2-10 liutf 修改为@RequestParam参数校验
                                                      @RequestParam(required = false, defaultValue = "大狼狗") String authorName,
                                                      @RequestParam(required = false, defaultValue = "com.softdev.system")String packageName,
-                                                     @RequestParam(required = false, defaultValue = "ApiReturnUtil")String returnUtil
+                                                     @RequestParam(required = false, defaultValue = "ApiReturnUtil")String returnUtil,
+                                                     @RequestParam(required = false, defaultValue = "true")boolean isUnderLineToCamelCase
     ) {
 
 
@@ -50,7 +51,7 @@ public class IndexController {
             }
 
             // parse table
-            ClassInfo classInfo = CodeGeneratorTool.processTableIntoClassInfo(tableSql);
+            ClassInfo classInfo = CodeGeneratorTool.processTableIntoClassInfo(tableSql, isUnderLineToCamelCase);
 
             // code genarete
             Map<String, Object> params = new HashMap<String, Object>();
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/CodeGeneratorTool.java b/generator-web/src/main/java/com/softdev/system/generator/util/CodeGeneratorTool.java
index 2f37d2b..3ef76f2 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/CodeGeneratorTool.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/CodeGeneratorTool.java
@@ -19,8 +19,8 @@ public class CodeGeneratorTool {
 	 * @param tableSql
 	 * @return
 	 */
-	public static ClassInfo processTableIntoClassInfo(String tableSql) throws IOException {
-		return TableParseUtil.processTableIntoClassInfo(tableSql);
+	public static ClassInfo processTableIntoClassInfo(String tableSql, boolean isUnderLineToCamelCase) throws IOException {
+		return TableParseUtil.processTableIntoClassInfo(tableSql, isUnderLineToCamelCase);
 	}
 
 }
\ No newline at end of file
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 6488897..f2f2c5d 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -24,7 +24,7 @@ public class TableParseUtil {
      * @param tableSql
      * @return
      */
-    public static ClassInfo processTableIntoClassInfo(String tableSql) throws IOException {
+    public static ClassInfo processTableIntoClassInfo(String tableSql, boolean isUnderLineToCamelCase) throws IOException {
         if (tableSql==null || tableSql.trim().length()==0) {
             throw new CodeGenerateException("Table structure can not be empty.");
         }
@@ -159,9 +159,15 @@ public class TableParseUtil {
                     columnName = columnLine.substring(0, columnLine.indexOf(" "));
 
                     // field Name
-                    String fieldName = StringUtils.lowerCaseFirst(StringUtils.underlineToCamelCase(columnName));
-                    if (fieldName.contains("_")) {
-                        fieldName = fieldName.replaceAll("_", "");
+//                    2019-09-08 yj 添加是否下划线转换为驼峰的判断
+                    String fieldName;
+                    if(isUnderLineToCamelCase){
+                        fieldName = StringUtils.lowerCaseFirst(StringUtils.underlineToCamelCase(columnName));
+                        if (fieldName.contains("_")) {
+                            fieldName = fieldName.replaceAll("_", "");
+                        }
+                    }else {
+                        fieldName = StringUtils.lowerCaseFirst(columnName);
                     }
 
                     // field class
diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl
index 8d296cd..3ee6887 100644
--- a/generator-web/src/main/resources/templates/index.ftl
+++ b/generator-web/src/main/resources/templates/index.ftl
@@ -52,7 +52,8 @@
                     "tableSql": tableSql,
                     "packageName":$("#packageName").val(),
                     "returnUtil":$("#returnUtil").val(),
-                    "authorName":$("#authorName").val()
+                    "authorName":$("#authorName").val(),
+                    "isUnderLineToCamelCase":$("#isUnderLineToCamelCase").val()
                 },
                 dataType: "json",
                 success: function (data) {
@@ -137,6 +138,14 @@
                 <span class="input-group-text">返回封装</span>
             </div>
             <input type="text" class="form-control" id="returnUtil" name="returnUtil" placeholder="ApiReturnObject">
+            <div class="input-group-prepend">
+                <span class="input-group-text">是否下划线转换为驼峰</span>
+            </div>
+            <select type="text" class="form-control" id="isUnderLineToCamelCase"
+                    name="isUnderLineToCamelCase">
+                <option value="true">转换</option>
+                <option value="false">不转换</option>
+            </select>
         </div>
         <textarea id="ddlSqlArea" placeholder="请输入表结构信息..." class="form-control btn-lg" style="height: 250px;">
 CREATE TABLE `userinfo` (