添加输入表名生成代码功能

Author: dolyw

README.md

@@ -53,9 +53,13 @@ SpringBoot + Mybatis + PageHelper + 通用Mapper + Thymeleaf(Amaze UI(布局) +
 ```
 ![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406003.png)
 ```
-配置更新界面如下
+输入表名生成代码界面如下
 ```
 ![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406004.png)
+```
+配置更新界面如下
+```
+![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406005.png)
 
 #### 搭建参考
 

src/main/java/com/example/constant/Constant.java

@@ -17,4 +17,9 @@ public interface Constant {
      */
     String COLON = ":";
 
+    /**
+     * 模板
+     */
+    String TEMPLATE = "template";
+
 }

src/main/java/com/example/controller/DataBaseController.java

@@ -16,6 +16,7 @@
 import com.generator.CustomGeneratorFacade;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +67,7 @@ public DataBaseController(GeneratorDao generatorDao) {
 
     /**
      * 列表
-     * @author Generator
+     * @author Wang926454
      * @date 2019-04-05 18:00:26
      */
     @GetMapping
@@ -81,7 +82,7 @@ public ResponseBean list(@RequestParam(defaultValue = "1") Integer page,
         map.put("tableName", tableName);
         PageHelper.startPage(page, rows);
         List<Map<String, Object>> list = generatorDao.queryList(map);
-        if (list == null || list.size() <= 0) {
+        if (list == null) {
             throw new CustomException("查询失败(Query Failure)");
         }
         PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
@@ -91,9 +92,29 @@ public ResponseBean list(@RequestParam(defaultValue = "1") Integer page,
         return new ResponseBean(HttpStatus.OK.value(), "查询成功", result);
     }
 
+    /**
+     * 获取所有表名
+     * @author Wang926454
+     * @date 2019-04-08 16:00:26
+     */
+    @GetMapping("/tableNames/all")
+    public ResponseBean all() {
+        // 获取所有表名
+        List<Map<String, Object>> list = generatorDao.queryList(null);
+        for (Map<String, Object> map : list) {
+            if (StringUtils.isNoneBlank(map.get("tableComment").toString())) {
+                map.put("label", map.get("tableName") + "---" + map.get("tableComment") + "---" + map.get("engine"));
+            } else {
+                map.put("label", map.get("tableName") + "---" + map.get("engine"));
+            }
+            map.put("value", map.get("tableName"));
+        }
+        return new ResponseBean(HttpStatus.OK.value(), "查询成功", list);
+    }
+
     /**
      * 表详细字段信息
-     * @author Generator
+     * @author Wang926454
      * @date 2019-04-05 18:00:26
      */
     @GetMapping("/{tableName}")
@@ -105,31 +126,9 @@ public ResponseBean detail(@PathVariable("tableName") String tableName) {
         return new ResponseBean(HttpStatus.OK.value(), "查询成功", columns);
     }
 
-    /**
-     * 打开Windows的代码输出文件夹
-     * @author Generator
-     * @date 2019-04-05 18:00:26
-     */
-    @GetMapping("/open")
-    public ResponseBean open() {
-        try {
-            // 有:应该是全路径
-            String[] array = outRoot.split(":");
-            if (array.length - 1 >= 0) {
-                Runtime.getRuntime().exec("cmd.exe /c start " + outRoot);
-            } else {
-                // 项目在硬盘上的基础路径
-                Runtime.getRuntime().exec("cmd.exe /c start " + System.getProperty("user.dir") + outRoot);
-            }
-        } catch (IOException e) {
-            throw new SystemException("操作失败");
-        }
-        return new ResponseBean(HttpStatus.OK.value(), "操作成功", null);
-    }
-
     /**
      * 生成代码到输出路径
-     * @author Generator
+     * @author Wang926454
      * @date 2019-04-05 18:00:26
      */
     @PostMapping("/{tableName}")
@@ -164,7 +163,7 @@ public ResponseBean genTable(@PathVariable("tableName") String tableName) throws
 
     /**
      * 生成代码为Zip文件下载
-     * @author Generator
+     * @author Wang926454
      * @date 2019-04-05 18:00:26
      */
     @GetMapping("/zip/{tableName}")
@@ -201,35 +200,30 @@ public void genTableToZip(@PathVariable("tableName") String tableName,
     }
 
     /**
-     * 通过表名称生成代码
-     * @param tableNames
+     * 打开Windows系统的代码输出文件夹
+     * @author Wang926454
+     * @date 2019-04-05 18:00:26
      */
-    public boolean genCode(String[] tableNames, String outRoot) throws IOException {
-        GeneratorFacade generatorFacade = new CustomGeneratorFacade(outRoot);
-        // 配置信息
-        GeneratorProperties.load(new String[]{ "classpath:config/generator.properties" });
-        // 模板位置
-        Generator generator = generatorFacade.getGenerator();
-        generator.addTemplateRootDir(Constant.PROJECT_PATH + template);
-        // 开始执行
+    @GetMapping("/open")
+    public ResponseBean open() {
         try {
-            for (String tableName : tableNames) {
-                // 删除旧文件
-                generatorFacade.deleteByTable(tableName);
-                // 生成新文件
-                generatorFacade.generateByTable(tableName);
+            // 有:应该是全路径
+            String[] array = outRoot.split(":");
+            if (array.length - 1 >= 0) {
+                Runtime.getRuntime().exec("cmd.exe /c start " + outRoot);
+            } else {
+                // 项目在硬盘上的基础路径
+                Runtime.getRuntime().exec("cmd.exe /c start " + System.getProperty("user.dir") + outRoot);
             }
-        } catch (Exception e) {
-            System.out.println("----- 生成失败 请检查数据库是否连接正常及表名是否正确以及权限是否缺失 -----");
-            e.printStackTrace();
-            return false;
+        } catch (IOException e) {
+            throw new SystemException("操作失败");
         }
-        return true;
+        return new ResponseBean(HttpStatus.OK.value(), "操作成功", null);
     }
 
     /**
      * 读取更新配置文件generator.properties
-     * @author Generator
+     * @author Wang926454
      * @date 2019-04-05 18:00:26
      */
     @PutMapping("/config")
@@ -256,7 +250,14 @@ public ResponseBean config(@RequestBody Map<String, String> map) {
                         Iterator<Map.Entry<String, String>> entries = map.entrySet().iterator();
                         while (entries.hasNext()) {
                             Map.Entry<String, String> entry = entries.next();
-                            System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
+                            if (Constant.TEMPLATE.equals(entry.getKey())) {
+                                // 查看配置路径下macro.includ文件是否存在
+                                File file = new File(Constant.PROJECT_PATH + entry.getValue() + "/macro.include");
+                                if (!file.exists()) {
+                                    // 模板代码位置不存在
+                                    return new ResponseBean(HttpStatus.BAD_REQUEST.value(), "当前填写的模板代码位置不存在", null);
+                                }
+                            }
                             safeProperties.setProperty(entry.getKey(), entry.getValue());
                         }
                         output = new FileOutputStream(url.getPath());
@@ -279,4 +280,36 @@ public ResponseBean config(@RequestBody Map<String, String> map) {
         return new ResponseBean(HttpStatus.OK.value(), "操作成功", map);
     }
 
+    /**
+     * 通过表名生成代码
+     * @param tableNames 表名数组
+	 * @param outRoot 代码输出文件夹
+     * @throws IOException
+     * @return boolean
+     * @author Wang926454
+     * @date 2019/4/8 17:19
+     */
+    public boolean genCode(String[] tableNames, String outRoot) throws IOException {
+        GeneratorFacade generatorFacade = new CustomGeneratorFacade(outRoot);
+        // 配置信息
+        GeneratorProperties.load(new String[]{ "classpath:config/generator.properties" });
+        // 模板位置
+        Generator generator = generatorFacade.getGenerator();
+        generator.addTemplateRootDir(Constant.PROJECT_PATH + template);
+        // 开始执行
+        try {
+            for (String tableName : tableNames) {
+                // 删除旧文件
+                generatorFacade.deleteByTable(tableName);
+                // 生成新文件
+                generatorFacade.generateByTable(tableName);
+            }
+        } catch (Exception e) {
+            System.out.println("----- 生成失败 请检查数据库是否连接正常及表名是否正确以及权限是否缺失 -----");
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
 }

src/main/resources/templates/common/common.html

@@ -15,6 +15,12 @@
     <link rel="stylesheet" th:href="@{css/component.css}"/>
     <link rel="shortcut icon" th:href="@{/favicon.ico}" type="image/x-icon"/>
     <style>
+        /* elementUI的确认弹出框时页面右侧缩小5px的解决方法 */
+        body {
+            padding-right:0 !important;
+        }
+
+        /* elementUI的Table表头错位的解决方法 */
         body .el-table th.gutter {
             display: table-cell!important;
         }
@@ -94,7 +100,7 @@ <h5><a href="https://wang64.cn" target="_blank" title="每天看着励志的语
         <ul class="am-list admin-sidebar-list">
 
             <li><a href="index.shtml"><i class="el-icon-news"></i>&nbsp;&nbsp;<b>首页</b></a></li>
-            <li><a href="table.shtml"><i class="el-icon-printer"></i>&nbsp;&nbsp;<b>代码生成</b></a></li>
+            <li><a href="table.shtml"><i class="el-icon-printer"></i>&nbsp;&nbsp;<b>生成代码</b></a></li>
             <li><a href="config.shtml"><i class="el-icon-edit-outline"></i>&nbsp;&nbsp;<b>配置更新</b></a></li>
 
             <!--<li class="admin-parent">

src/main/resources/templates/config.html

@@ -216,24 +216,34 @@ <h5 class="header-title m-t-0 m-b-30">说明</h5>
                 this.$refs.generator.validate((valid) => {
                     // 加载显示
                     this.submitLoading = true;
-                    console.log(valid)
+                    // console.log(valid)
                     if (valid) {
-                        this.$notify({
-                            dangerouslyUseHTMLString: true,
-                            title: '请等待',
-                            message: '配置更新会导致应用热重启'
-                        });
                         this.generator.isRead = false;
                         axios.put('/database/config', this.generator).then(res => {
                             var data = res.data;
-                            this.generator = data.data;
-                            setTimeout(() => {
-                                this.submitLoading = false;
-                                this.$message({
-                                    message: data.msg,
-                                    type: 'success'
+                            if (data.code === 200) {
+                                this.$notify({
+                                    dangerouslyUseHTMLString: true,
+                                    title: '请等待',
+                                    message: '配置更新会导致应用热重启'
                                 });
-                            }, 3033);
+                                this.generator = data.data;
+                                setTimeout(() => {
+                                    this.submitLoading = false;
+                                    this.$message({
+                                        message: data.msg,
+                                        type: 'success'
+                                    });
+                                }, 3033);
+                            } else {
+                                this.$notify({
+                                    dangerouslyUseHTMLString: true,
+                                    title: '提示',
+                                    message: data.msg
+                                });
+                                this.$message.error(data.msg);
+                                this.submitLoading = false;
+                            }
                         }).catch(err => {
                                 console.log(err.response);
                             this.submitLoading = false;