ap-dev 1.1.9 → 1.1.13

package/dev/ApiPanel/menus.js

@@ -80,21 +80,15 @@ const menus = [
             }, {
                 id: 'ApiApSql',
                 label: '5.2 动态SQL'
-            }, {
-                id: 'ApiServiceUtil',
-                label: '5.3 生成通用代码'
             }, {
                 id: 'ApiMybatis',
-                label: '5.4 Mybatis规范'
-            }, {
-                id: 'ApiPaging',
-                label: '5.5 表格分页'
+                label: '5.3 Mybatis规范'
             }, {
                 id: 'ApiJavaUtils',
-                label: '5.6 常用工具类'
+                label: '5.4 常用工具类'
             }, {
                 id: 'ApiOtherJava',
-                label: '5.7 其他'
+                label: '5.5 其他'
             }]
     }]
 export default menus

package/dev/ApiPanel/modules/ApiGrid.vue

@@ -271,7 +271,7 @@ toolbarBtn: ["add", "edit", "del", "cancel", "refresh", "save", "separator",
         default: '无',
         memo: '添加行时对象的默认值。<br>一对象：默认值。<br>二、方法：()方法返回默认值<br><span class="api-memo">注：和列的addDefaultValue效果相同，主要处理页面不需要显示的字段的默认值。</span>',
         code: '<span class="api-code">// 1、对象形式：添加行的fdDeleted默认为0 <br>addDefaultObj: {fdDeleted:0}' +
-                    '<br>// 2、方法形式：动态返回添加行的默认值 <br>addDefaultObj: () => {fdDeleted:0}</span>'
+                    '<br>// 2、方法形式：动态返回添加行的默认值 <br>addDefaultObj: () => { return {fdDeleted:0} }</span>'
       }
     ]
     const gridAttrData_col = [

package/dev/ApiPanel/modules/ApiJavaCommon.vue

@@ -1,24 +1,50 @@
 <template>
-    <api-tabs :options.sync="opts"></api-tabs>
+    <el-tabs v-model="activeName" tabPosition="left" class="api-tabs">
+        <template v-for="(item,index) in opts">
+            <el-tab-pane :label="item.label" :name="'tab' + index" class="api-tab">
+                <component :is="item.component"></component>
+            </el-tab-pane>
+        </template>
+    </el-tabs>
 </template>
 
 <script>
-import ApiTabs from './../components/ApiTabs'
+import ApiServiceUtil from './../tabs/ApiServiceUtil'
+import ApiException from './../tabs/ApiException'
+import ApiPermission from './../tabs/ApiPermission'
+import ApiPaging from './../tabs/ApiPaging'
+import ApiTask from './../tabs/ApiTask'
 
 export default {
-    name: "ApiJavaCommon",
-    components: {ApiTabs},
+    name: "ApiJavaCommonUtil",
+    components: {
+        ApiServiceUtil,
+        ApiException,
+        ApiPermission,
+        ApiPaging,
+        ApiTask
+    },
     data() {
-        let opts = [
-            {
-                label: "1.异常处理",
-                component: "ApiException"
-            },{
-                label: "2.权限判断",
-                component: "ApiPermission"
-            }
+
+        let opts = [{
+            label: "代码生成",
+            component: "ApiServiceUtil"
+        }, {
+            label: "异常处理",
+            component: "ApiException"
+        }, {
+            label: "权限判断",
+            component: "ApiPermission"
+        }, {
+            label: "表格分页",
+            component: "ApiPaging"
+        }, {
+            label: "调度管理",
+            component: "ApiTask"
+        }
         ];
         return {
+            activeName: 'tab0',
             opts: opts
         }
     }
@@ -26,4 +52,13 @@ export default {
 </script>
 
 <style scoped>
+.api-tabs {
+    display: flex;
+    height: 100%;
+}
+
+.api-tabs /deep/ .el-tabs__content {
+    flex: 1;
+    overflow: scroll;
+}
 </style>

package/dev/ApiPanel/tabs/ApiApAsideTree.vue

@@ -48,6 +48,12 @@ export default {
                 memo: `显示checkbox选择框<br>
                             <span class="api-memo">注：支持多选时要配置</span>`,
                 code: `<div class="api-code">showCheckbox: true,</div>`
+            },{
+                name: 'defaultExpandAll',
+                type: '布尔',
+                default: 'true',
+                memo: `默认展开`,
+                code: `<div class="api-code">defaultExpandAll: false,</div>`
             },{
                 name: 'toolbarBtn',
                 type: '数组',

package/dev/ApiPanel/tabs/ApiStringUtil.vue

@@ -1,101 +1,107 @@
 <template>
-  <div style="height: 100%">
-    <h3>字符串工具类 - StringUtil</h3>
-    <api-table :data="methodData" :columns="methodCols" />
-  </div>
+    <div style="height: 100%">
+        <h3>字符串工具类 - StringUtil</h3>
+        <api-table :data="methodData" :columns="methodCols"/>
+    </div>
 </template>
 
 <script>
-import { ApiCode, ApiContent, ApiTable, ApiTittle1, ApiTittle2 } from './../components'
+import {ApiCode, ApiContent, ApiTable, ApiTittle1, ApiTittle2} from './../components'
 
 export default {
-  name: 'ApiStringUtil',
-  components: {
-    ApiTable, ApiCode, ApiTittle1, ApiContent, ApiTittle2
-  },
-  data() {
-    const methodCols = [
-      { label: '方法名', prop: 'name', width: '220px' },
-      { label: '说明', prop: 'memo', width: '300px' },
-      { label: '示例代码', prop: 'code', minWidth: '100px' }]
-    const methodData = [
-      {
-        name: 'isEmpty',
-        memo: `判断是否为空<br><span class="api-memo">注：null和"" 均为空。</span>`,
-        code: `<span class="api-code">// 1、为空：返回true
+    name: 'ApiStringUtil',
+    components: {
+        ApiTable, ApiCode, ApiTittle1, ApiContent, ApiTittle2
+    },
+    data() {
+        const methodCols = [
+            {label: '方法名', prop: 'name', width: '220px'},
+            {label: '说明', prop: 'memo', width: '300px'},
+            {label: '示例代码', prop: 'code', minWidth: '100px'}]
+        const methodData = [
+            {
+                name: 'isEmpty',
+                memo: `判断是否为空<br><span class="api-memo">注：null和"" 均为空。</span>`,
+                code: `<span class="api-code">// 1、为空：返回true
 boolean a = StringUtil.isEmpty("");
 boolean a = StringUtil.isEmpty(null);
 // 2、不为空：false
 boolean a = StringUtil.isEmpty("xx");
 </span>`
-      },
-      {
-        name: 'isNotEmpty',
-          memo: `判断是否不为空<br><span class="api-memo">注：null和"" 均为空。</span>`,
-          code: `<span class="api-code">// 1、不为空：返回true
+            },
+            {
+                name: 'isNotEmpty',
+                memo: `判断是否不为空<br><span class="api-memo">注：null和"" 均为空。</span>`,
+                code: `<span class="api-code">// 1、不为空：返回true
 boolean a = StringUtil.isNotEmpty("xx");
 // 2、为空：返回false
 boolean a = StringUtil.isNotEmpty("");
 boolean a = StringUtil.isNotEmpty(null);
 </span>`
-      },
-      {
-        name: 'convertStringToDB',
-        memo: '将驼峰属性转为DB形式<br>userName -> user_name',
-        code: `<span class="api-code">// 转换：返回 user_name
+            },
+            {
+                name: 'convertStringToDB',
+                memo: '将驼峰属性转为DB形式<br>userName -> user_name',
+                code: `<span class="api-code">// 转换：返回 user_name
 String a= StringUtil.convertStringToDB("userName")
 </span>`
-      },
-      {
-        name: 'convertDBStrToParam',
-        memo: '将DB形式转为驼峰属性<br>user_name -> userName',
-        code: `<span class="api-code">// 转换：返回 userName
+            },
+            {
+                name: 'convertDBStrToParam',
+                memo: '将DB形式转为驼峰属性<br>user_name -> userName',
+                code: `<span class="api-code">// 转换：返回 userName
 String a= StringUtil.convertDBStrToParam("user_name")</span>`
-      },
-      {
-        name: 'convertDBStrToBean',
-        memo: '将DB形式转为驼峰属性<br>user_name -> UserName',
-        code: `<span class="api-code">// 转换：返回 UserName
+            },
+            {
+                name: 'convertDBStrToBean',
+                memo: '将DB形式转为驼峰属性<br>user_name -> UserName',
+                code: `<span class="api-code">// 转换：返回 UserName
 String a= StringUtil.convertDBStrToBean("user_name")</span>`
-      },
-      {
-        name: 'convertSqlParam',
-        memo: '字符串转为引号拼接形式<br> a,b,c -> \'a\',\'b\',\'c\'<br> <span class="api-memo">注：转换后，数据库形式逗号拼接的字符串。</span>',
-        code: `<span class="api-code">// 转换：返回 'a','b','c'
+            },
+            {
+                name: 'convertSqlParam',
+                memo: '字符串转为引号拼接形式<br> a,b,c -> \'a\',\'b\',\'c\'<br> <span class="api-memo">注：转换后，数据库形式逗号拼接的字符串。</span>',
+                code: `<span class="api-code">// 转换：返回 'a','b','c'
 String a= StringUtil.convertDBStrToBean("a,b,c")</span>`
-      },
-      {
-        name: 'convertToList',
-        memo: '","拼接的字符串转为list',
-        code: `<span class="api-code">// 转换：返回list
+            },
+            {
+                name: 'convertToList',
+                memo: '","拼接的字符串转为list',
+                code: `<span class="api-code">// 转换：返回list
  List&lt;String> a= StringUtil.convertToList("a,b,c")</span>`
-      },
-      {
-        name: 'getSuffix',
-        memo: '获取文件的后缀名',
-        code: `<span class="api-code">// 返回 .jpg
+            },
+            {
+                name: 'asList',
+                memo: '","拼接的字符串转为list',
+                code: `<span class="api-code">// 转换：返回list
+ List&lt;Object> a= StringUtil.asList("a,b,c")</span>`
+            },
+            {
+                name: 'getSuffix',
+                memo: '获取文件的后缀名',
+                code: `<span class="api-code">// 返回 .jpg
 String a= StringUtil.getSuffix("aaa.jgp")</span>`
-      },
-      {
-        name: 'initialUpperCase',
-        memo: '字符串首字母转为大写',
-        code: `<span class="api-code">// 返回 Abc
+            },
+            {
+                name: 'initialUpperCase',
+                memo: '字符串首字母转为大写',
+                code: `<span class="api-code">// 返回 Abc
 String a= StringUtil.initialUpperCase("abc")</span>`
-      },
-      {
-        name: 'deleteLastChar',
-        memo: '删除最后一个字符',
-        code: `<span class="api-code">// 返回 ab
+            },
+            {
+                name: 'deleteLastChar',
+                memo: '删除最后一个字符',
+                code: `<span class="api-code">// 返回 ab
 String a= StringUtil.deleteLastChar("abc")</span>`
-      }
-    ]
+            }
+        ]
 
-    return {
-      methodData,
-      methodCols
-    }
-  },
-  methods: {}
+        return {
+            methodData,
+            methodCols
+        }
+    },
+    methods: {}
 }
 </script>
 

package/dev/ApiPanel/tabs/ApiTask.vue

@@ -0,0 +1,80 @@
+<template>
+    <div style="line-height: 1.5;">
+        <api-tittle-1>任务调度管理：</api-tittle-1>
+        <api-tittle-2>一、【调度任务】定义任务</api-tittle-2>
+        <api-content>
+            <b>表格列说明：</b><br>
+            <b>任务类型：</b>任务分组类型<br>
+            <b>接口类型：</b>kettle、java接口。<br>
+            <b>路径(java接口)：</b>/项目名/xx/xxx。如：/bi/test/getXxx<br>
+            <b>路径(kettle)：</b>kettle需要上传kettle文件，上传成功自动生成路径<br>
+            <div class="api-memo">注：1、java接口即为controller接口。<br>
+                2、kettle接口，支持转换(*.ktr)和job(*.kjb)<br>
+                3、kettle文件使用Spoon生成，对应的spoon版本：pdi-ce-9.2.0.0-290<br>
+                4、需要kettle执行本地文件时，可手动将路径临时改为本地路径。例："E:\kettle\test.ktr"<br>
+            </div>
+        </api-content>
+        <br>
+        <api-tittle-2>二、【调度环境】定义任务可执行的环境ip</api-tittle-2>
+        <api-content>
+            <b>表格列说明：</b><br>
+            <b>ip地址：</b>调度计划的配置项，具体参考调度计划。<br>
+        </api-content>
+        <br>
+        <api-tittle-2>三、【调度计划】定义任务可执行的时间</api-tittle-2>
+        <api-content>
+            <b>操作说明：</b><br>
+            <b>立即执行：</b>立即执行调度计划任务<br>
+            <b>加载：</b>将调度计划加载到spring中，只有加载到spring中的计划定时才生效<br>
+            <b>移除：</b>将调度计划从spring中移除<br>
+            <br>
+            <b>表格列说明：</b><br>
+            <b>调度任务：</b>选择需要执行的任务<br>
+            <b>定时表达式：</b>cron表达式<br>
+            <b>执行环境：</b>选择允许执行的环境。eg：如果想要本地执行定时任务，那么执行环境必须有选择本地的ip项<br>
+            <b>开始时间、结束时间：</b>不填表示长期执行的计划。有填写，在任务调度时会校验时间<br>
+            <b>加载状态：</b>调度计划是否已经加载到spring中<br>
+            <div class="api-memo">注：1、调度计划不执行：定时任务失效、调度计划失效、调度时间不在调度计划的区间内，调度计划会终止执行。<br>
+            </div>
+        </api-content>
+        <br>
+        <api-tittle-2>四、【同步时间戳】记录数据库表的最后同步时间</api-tittle-2>
+        <api-content>
+            <b>表格列说明：</b><br>
+            <b>编码：</b>编码，用于获取和更新时间戳<br>
+            <b>名称：</b>同步名称<br>
+            <b>表：</b>同步的数据库表<br>
+            <b>数据源：</b>同步的数据源<br>
+            <api-code>
+                // 更新时间戳：code-> 编码、lastTime-> 最后更新时间<br>
+                TaskUtil.updateTimeStamp(code, lastTime)<br>
+                // 更新时间戳：code-> 编码<br>
+                TaskUtil.getTimeStamp(code)<br>
+            </api-code>
+            <div class="api-memo">
+                注：同步时间戳需要在各自接口中手动调用<br>
+            </div>
+        </api-content>
+        <br>
+        <api-tittle-2>五、【调度日志】</api-tittle-2>
+        <api-content>
+            查看调度计划执行的情况
+        </api-content>
+        <br>
+    </div>
+</template>
+
+<script>
+import {ApiCode, ApiContent, ApiTable, ApiTittle1, ApiTittle2} from './../components'
+
+export default {
+    name: 'ApiLoginUser',
+    components: {
+        ApiTable, ApiCode, ApiTittle1, ApiContent, ApiTittle2
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

package/dev/BackgroundPanel/index.vue

@@ -11,7 +11,7 @@
                 <el-tree
                     ref="typeTree"
                     class="filter-tree"
-                    node-key="fdId"
+                    node-key="tableName"
                     :data="typeTreeList"
                     :props="defaultProps"
                     :highlight-current="true"
@@ -25,9 +25,9 @@
                 >
                     <div slot-scope="{ node, data }" style="width: 100%">
                         <div class="dev-tree-node-left ap-ellipse">
-                            {{ data.fdName }}
+                            {{ data.tableName }}
                         </div>
-                        <div style="font-size: 12px;">{{ data.comment }}</div>
+                        <div style="font-size: 12px;">{{ data.tableComment }}</div>
                     </div>
                 </el-tree>
             </div>
@@ -57,7 +57,9 @@
                 <div>
                     <span v-if="selectedTables.length <1" style="color: red;font-size: 14px;">请选择需要生成的表</span>
                     <template v-for="t in selectedTables">
-                        <el-tag style="margin: 5px;width: 30%;">{{ t.comment }}：{{ t.tableSchema }}.{{ t.fdName }}
+                        <el-tag style="margin: 5px;width: 30%;">{{ t.tableComment }}：{{ t.tableSchema }}.{{
+                                t.tableName
+                            }}
                         </el-tag>
                     </template>
                 </div>
@@ -115,6 +117,7 @@
 <script>
 import {convertToTreeData} from 'ap-util/util/DataUtil'
 import {getUserConfig} from './../dev/DevUtil'
+
 export default {
     name: 'BackgroundPanel',
     data() {
@@ -126,7 +129,7 @@ export default {
             typeTreeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'fdName'
+                label: 'tableName'
             },
             // ----- dialog -----
             selectedTables: [],
@@ -154,7 +157,7 @@ export default {
         // 左侧树：列头
         setHeaderName() {
             if (this.typeTreeList.length > 1) {
-                this.headerName = "[" + this.typeTreeList[0].fdDatabase + "] - 表";
+                this.headerName = "[" + this.typeTreeList[0].tableSchema + "] - 表";
             }
         },
         // 左侧树：加载数据
@@ -168,8 +171,8 @@ export default {
                 }
             }).then(response => {
                 this.typeTreeList = convertToTreeData(response.data, {
-                    idKey: "fdId",
-                    parentKey: "fdParentId",
+                    idKey: "tableName",
+                    parentKey: "parentId",
                     childrenKey: "children",
                 });
                 this.setHeaderName();
@@ -186,10 +189,10 @@ export default {
         // 左侧树：过滤节点
         filterNode(value, data) {
             if (!value) return true
-            if (data.fdName.indexOf(value) !== -1) {
+            if (data.tableName.indexOf(value) !== -1) {
                 return true
             }
-            if (data.comment != null && data.comment.indexOf(value) !== -1) {
+            if (data.tableComment != null && data.tableComment.indexOf(value) !== -1) {
                 return true
             }
             return false
@@ -202,9 +205,7 @@ export default {
 
             const newList = []
             for (let i = 0; i < tables.length; i++) {
-                if (tables[i].fdType == 1) {
-                    newList.push(tables[i])
-                }
+                newList.push(tables[i])
             }
             this.selectedTables = newList
         },
@@ -250,7 +251,7 @@ export default {
                 return
             }
 
-            const javaUrl =this.userConfig.fdJavaPath
+            const javaUrl = this.userConfig.fdJavaPath
             if (javaUrl == null || javaUrl == '') {
                 this.$message.error('请先配置共通参数。【顶栏】->【配置】')
                 return
@@ -268,7 +269,7 @@ export default {
             for (let i = 0; i < this.selectedTables.length; i++) {
                 const selectedTable = this.selectedTables[i]
                 tableList.push({
-                    fdName: selectedTable.fdName,
+                    tableName: selectedTable.tableName,
                     tableSchema: selectedTable.tableSchema
                 })
             }

package/dev/ConfigPanel/DevDbSource.vue

@@ -0,0 +1,108 @@
+<template>
+    <ap-container>
+        <ap-main margin="1111">
+            <div v-if="!showPage">
+                <el-input v-model="secretKey" placeholder="请输入授权秘钥！" show-password style="width: 200px"></el-input>
+                <el-button type="primary" @click="checkPageAuth">确定</el-button>
+            </div>
+            <ap-table v-if="showPage" ref="tDevDbSourceRef" :options.sync="tDevDbSourceOpt"></ap-table>
+        </ap-main>
+    </ap-container>
+</template>
+
+<script>
+export default {
+    name: 'DevDbSource',
+    data() {
+        let columns = [
+            {
+                prop: 'fdName',
+                label: '连接名',
+                type: 'input',
+                width: 150,
+            }, {
+                prop: 'fdDbName',
+                label: '数据库名称',
+                type: 'input',
+                width: 100,
+            }, {
+                prop: 'fdUrl',
+                label: '数据库地址',
+                type: 'input',
+                minWidth: 200,
+                showOverflowTooltip: true
+            }, {
+                prop: 'fdUserName',
+                label: '数据库用户名',
+                type: 'input',
+                width: 100,
+            }, {
+                prop: 'fdPassword',
+                label: '数据库密码',
+                type: 'input',
+                width: 100,
+                html: function (value, row) {
+                    return "******";
+                }
+            }, {
+                prop: 'fdComment',
+                label: '备注',
+                type: 'input',
+                minWidth: 150,
+            }, {
+                prop: "fdDisabled",
+                label: "是否有效",
+                type: "select",
+                width: 100,
+                selectOptions: [{label: "失效", value: 1}, {label: "有效", value: 0}],
+                addDefaultValue: 0,
+                align: "center",
+                html: function (value, row) {
+                    if (value == 1) {
+                        return '<div class="ap-tag-danger">失效</div>'
+                    } else if (value == 0) {
+                        return '<div class="ap-tag-success">有效</el-tag>';
+                    }
+                }
+            },
+        ];
+        let tableOpt = {
+            title: "数据源管理",
+            columns: columns,
+            editPk: "fdId", //默认fdId
+            deletePk: "fdId", // 默认fdId
+            dataUrl: "/apd/db/TDevDbSource/getTDevDbSourceGridList",
+            saveUrl: "/apd/db/TDevDbSource/saveTDevDbSourceGridData",
+            deleteUrl: "/apd/db/TDevDbSource/deleteTDevDbSourceGridData",
+            toolbarBtn: ["add", "edit", "del", "cancel", "refresh", "save"],
+            initData: true, // 默认false
+            params: {}
+        };
+        return {
+            tDevDbSourceOpt: tableOpt,
+            secretKey: '',
+            showPage: false
+        }
+    },
+    methods: {
+        checkPageAuth() {
+            this.$request({
+                url: '/apd/db/TDevDbAuth/checkPageAuth',
+                method: 'post',
+                data: {
+                    secretKey: this.secretKey
+                }
+            }).then(response => {
+                if (response.data) {
+                    this.showPage = true;
+                } else {
+                    this.$message.error("授权秘钥错误！")
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style scoped>
+</style>