From 8473e7a4e41b827576bed432f578235182e9ac91 Mon Sep 17 00:00:00 2001
From: "20932067@zju.edu.cn" <Clay>
Date: Fri, 22 Jan 2021 21:51:38 +0800
Subject: [PATCH] 11

---
 hchyun-ui/package.json                        |   1 +
 hchyun-ui/src/views/tool/gen/editTable.vue    |   7 +-
 hchyun-ui/src/views/tool/gen/genInfoForm.vue  | 179 ++++++++++++------
 hchyun-ui/src/views/tool/gen/index.vue        |  32 +++-
 .../hchyun/common/core/entity/BaseEntity.java |   9 +-
 5 files changed, 165 insertions(+), 63 deletions(-)

diff --git a/hchyun-ui/package.json b/hchyun-ui/package.json
index 59170c9..b0200c2 100644
--- a/hchyun-ui/package.json
+++ b/hchyun-ui/package.json
@@ -47,6 +47,7 @@
     "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
+    "highlight.js": "9.18.5",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
diff --git a/hchyun-ui/src/views/tool/gen/editTable.vue b/hchyun-ui/src/views/tool/gen/editTable.vue
index 0cb18d8..5b01b46 100644
--- a/hchyun-ui/src/views/tool/gen/editTable.vue
+++ b/hchyun-ui/src/views/tool/gen/editTable.vue
@@ -99,6 +99,8 @@
                 <el-option label="单选框" value="radio" />
                 <el-option label="复选框" value="checkbox" />
                 <el-option label="日期控件" value="datetime" />
+                <el-option label="图片上传" value="imageUpload" />
+                <el-option label="文件上传" value="fileUpload" />
                 <el-option label="富文本控件" value="editor" />
               </el-select>
             </template>
@@ -120,7 +122,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="生成信息" name="genInfo">
-        <gen-info-form ref="genInfo" :info="info" :menus="menus"/>
+        <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
       </el-tab-pane>
     </el-tabs>
     <el-form label-width="100px">
@@ -152,6 +154,8 @@ export default {
       activeName: "cloum",
       // 表格的高度
       tableHeight: document.documentElement.scrollHeight - 245 + "px",
+      // 表信息
+      tables: [],
       // 表列信息
       cloumns: [],
       // 字典信息
@@ -170,6 +174,7 @@ export default {
       getGenTable(tableId).then(res => {
         this.cloumns = res.data.rows;
         this.info = res.data.info;
+        this.tables = res.data.tables;
       });
       /** 查询字典下拉列表 */
       getDictOptionselect().then(response => {
diff --git a/hchyun-ui/src/views/tool/gen/genInfoForm.vue b/hchyun-ui/src/views/tool/gen/genInfoForm.vue
index bd4a2d8..9d36b9d 100644
--- a/hchyun-ui/src/views/tool/gen/genInfoForm.vue
+++ b/hchyun-ui/src/views/tool/gen/genInfoForm.vue
@@ -4,9 +4,10 @@
       <el-col :span="12">
         <el-form-item prop="tplCategory">
           <span slot="label">生成模板</span>
-          <el-select v-model="info.tplCategory">
+          <el-select v-model="info.tplCategory" @change="tplSelectChange">
             <el-option label="单表（增删改查）" value="crud" />
             <el-option label="树表（增删改查）" value="tree" />
+            <el-option label="主子表（增删改查）" value="sub" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -126,8 +127,8 @@
           </span>
           <el-select v-model="info.treeCode" placeholder="请选择">
             <el-option
-              v-for="column in info.columns"
-              :key="column.columnName"
+              v-for="(column, index) in info.columns"
+              :key="index"
               :label="column.columnName + '：' + column.columnComment"
               :value="column.columnName"
             ></el-option>
@@ -144,8 +145,8 @@
           </span>
           <el-select v-model="info.treeParentCode" placeholder="请选择">
             <el-option
-              v-for="column in info.columns"
-              :key="column.columnName"
+              v-for="(column, index) in info.columns"
+              :key="index"
               :label="column.columnName + '：' + column.columnComment"
               :value="column.columnName"
             ></el-option>
@@ -162,8 +163,47 @@
           </span>
           <el-select v-model="info.treeName" placeholder="请选择">
             <el-option
-              v-for="column in info.columns"
-              :key="column.columnName"
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row v-show="info.tplCategory == 'sub'">
+      <h4 class="form-header">关联信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            关联子表的表名
+            <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
+            <el-option
+              v-for="(table, index) in tables"
+              :key="index"
+              :label="table.tableName + '：' + table.tableComment"
+              :value="table.tableName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            子表关联的外键名
+            <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableFkName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in subColumns"
+              :key="index"
               :label="column.columnName + '：' + column.columnComment"
               :value="column.columnName"
             ></el-option>
@@ -174,56 +214,87 @@
   </el-form>
 </template>
 <script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-export default {
-  name: "BasicInfoForm",
-  components: { Treeselect },
-  props: {
-    info: {
-      type: Object,
-      default: null
+  export default {
+    name: "BasicInfoForm",
+    components: { Treeselect },
+    props: {
+      info: {
+        type: Object,
+        default: null
+      },
+      tables: {
+        type: Array,
+        default: null
+      },
+      menus: {
+        type: Array,
+        default: []
+      },
     },
-    menus: {
-      type: Array,
-      default: []
-    },
-  },
-  data() {
-    return {
-      rules: {
-        tplCategory: [
-          { required: true, message: "请选择生成模板", trigger: "blur" }
-        ],
-        packageName: [
-          { required: true, message: "请输入生成包路径", trigger: "blur" }
-        ],
-        moduleName: [
-          { required: true, message: "请输入生成模块名", trigger: "blur" }
-        ],
-        businessName: [
-          { required: true, message: "请输入生成业务名", trigger: "blur" }
-        ],
-        functionName: [
-          { required: true, message: "请输入生成功能名", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {},
-  methods: {
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
+    data() {
       return {
-        id: node.menuId,
-        label: node.menuName,
-        children: node.children
+        subColumns: [],
+        rules: {
+          tplCategory: [
+            { required: true, message: "请选择生成模板", trigger: "blur" }
+          ],
+          packageName: [
+            { required: true, message: "请输入生成包路径", trigger: "blur" }
+          ],
+          moduleName: [
+            { required: true, message: "请输入生成模块名", trigger: "blur" }
+          ],
+          businessName: [
+            { required: true, message: "请输入生成业务名", trigger: "blur" }
+          ],
+          functionName: [
+            { required: true, message: "请输入生成功能名", trigger: "blur" }
+          ],
+        }
       };
+    },
+    created() {},
+    watch: {
+      'info.subTableName': function(val) {
+        this.setSubTableColumns(val);
+      }
+    },
+    methods: {
+      /** 转换菜单数据结构 */
+      normalizer(node) {
+        if (node.children && !node.children.length) {
+          delete node.children;
+        }
+        return {
+          id: node.menuId,
+          label: node.menuName,
+          children: node.children
+        };
+      },
+      /** 选择子表名触发 */
+      subSelectChange(value) {
+        this.info.subTableFkName = '';
+      },
+      /** 选择生成模板触发 */
+      tplSelectChange(value) {
+        if(value !== 'sub') {
+          this.info.subTableName = '';
+          this.info.subTableFkName = '';
+        }
+      },
+      /** 设置关联外键 */
+      setSubTableColumns(value) {
+        for (var item in this.tables) {
+          const name = this.tables[item].tableName;
+          if (value === name) {
+            this.subColumns = this.tables[item].columns;
+            break;
+          }
+        }
+      }
     }
-  }
-};
+  };
 </script>
diff --git a/hchyun-ui/src/views/tool/gen/index.vue b/hchyun-ui/src/views/tool/gen/index.vue
index 732ee64..8e9b513 100644
--- a/hchyun-ui/src/views/tool/gen/index.vue
+++ b/hchyun-ui/src/views/tool/gen/index.vue
@@ -32,7 +32,7 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -41,6 +41,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
+          plain
           icon="el-icon-download"
           size="mini"
           @click="handleGenTable"
@@ -50,6 +51,7 @@
       <el-col :span="1.5">
         <el-button
           type="info"
+          plain
           icon="el-icon-upload"
           size="mini"
           @click="openImportTable"
@@ -59,6 +61,7 @@
       <el-col :span="1.5">
         <el-button
           type="success"
+          plain
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -69,6 +72,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
+          plain
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
@@ -80,7 +84,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -91,21 +95,21 @@
         align="center"
         prop="tableName"
         :show-overflow-tooltip="true"
-        width="130"
+        width="120"
       />
       <el-table-column
         label="表描述"
         align="center"
         prop="tableComment"
         :show-overflow-tooltip="true"
-        width="130"
+        width="120"
       />
       <el-table-column
         label="实体"
         align="center"
         prop="className"
         :show-overflow-tooltip="true"
-        width="130"
+        width="120"
       />
       <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
@@ -165,7 +169,7 @@
           :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
           :key="key"
         >
-          <pre>{{ value }}</pre>
+        <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
@@ -177,6 +181,15 @@
 import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
 import importTable from "./importTable";
 import { downLoadZip } from "@/utils/zipdownload";
+import hljs from "highlight.js/lib/highlight";
+import "highlight.js/styles/github-gist.css";
+hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
+hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
+hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
+
 export default {
   name: "Gen",
   components: { importTable },
@@ -289,6 +302,13 @@ export default {
         this.preview.open = true;
       });
     },
+    /** 高亮显示 */
+    highlightedCode(code, key) {
+      const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
+      var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+      const result = hljs.highlight(language, code || "", true);
+      return result.value || '&nbsp;';
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.tableId);
diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java
index d502122..48d4d71 100644
--- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java
+++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java
@@ -75,8 +75,13 @@ public class BaseEntity implements Serializable {
         if (parameter != null || parameter.equals("")) {
             this.parameter = parameter;
             JSONObject jsonObject = JSONObject.parseObject(parameter);
-            params = new HashMap<>();
-            params.put("",jsonObject.get(""));
+            Object beginCreateTime = jsonObject.get("beginCreateTime");
+            Object endCreateTime = jsonObject.get("endCreateTime");
+            if (beginCreateTime != null && !beginCreateTime.equals("") && endCreateTime != null && !endCreateTime.equals("")) {
+                params = new HashMap<>();
+                params.put("beginCreateTime", beginCreateTime);
+                params.put("endCreateTime", endCreateTime);
+            }
         }
     }