Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】宁夏的应用管理和服务管理迁移到500-dev的base See merge request !869

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【无】宁夏的应用管理和服务管理迁移到500-dev的base See merge request !869
王涛
Commit 6ba91b3556cda66ddbd43ceef5b858e8dbf98fe8 2 parents 91773d00 9d20644c
Showing 4 changed files with 54 additions and 158 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/application.js
hg-monitor-web-base/src/main/resources/static/src/controller/server.js
hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/application/index.html
hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/server/index.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/application.js
View file @6ba91b3
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/application.js
View file @6ba91b3
@@ -22,10 +22,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 加载遮罩
         var loading;
-        //获得权限列表
-        var checkList = common.checkPermission(accessToken);
-
-        var codeIsExist = false;
         loadApplicationTable();
@@ -36,31 +32,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 return false;
             }
         });
-        $("#applicationQueryBtn").on("click", function () {
-            loadApplicationTable();
-        })
         /**
          * 加载应用信息表格
          */
         function loadApplicationTable() {
             conditions.appName = $('#condition-app-name').val().trim();
-            conditions.busTypeName = $('#condition-app-name').val().trim();
-            conditions.appDesc = $('#condition-app-name').val().trim();
             applicationTable = table.render({
-                elem: '#table-application-table',
+                elem: '#application-table',
                 url: domainName + '/api-web/manage/application/page?access_token=' + accessToken,
                 where: conditions,
-                height: 'full-200',
+                height: 'full-250',
                 page: {
                     theme: '#1E9FFF'
                 },
-                limit: common.limit,
-                limits: common.limits,
                 cols: [[
                     {
                         type: 'checkbox'
-                    }, {title: '序号', align: "center", type: 'numbers', event: 'dblclick', width: '5%'}, {
+                    },{title: '序号', align: "center", type: 'numbers', event: 'dblclick', width: '5%'},{
                         //   field: 'appCode', title: '应用编号', align: 'center', sort: true,
                         //   templet:
                         //     '<div>' +
@@ -70,21 +59,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         //     '  </span>' +
                         //     '</div>'
                         // }, {
-                        field: 'appName', title: '应用名称', align: 'center', sort: true, width: '20%',
+                        field: 'appName', title: '应用名称', align: 'center', sort: true,
                         templet:
                             '<div>' +
                             '  <span' +
                             '    data-index="{{d.LAY_TABLE_INDEX}}"' +
-                            '    data-bustypename="{{d.busTypeName}}"' +
-                            '    data-appdesc="{{d.appDesc}}"' +
-                            '    data-busid="{{d.busId}}"' +
-                            '    data-appid="{{d.appId}}"' +
-                            '    data-appcode="{{d.appCode}}"' +
                             '    class="layui-table-link btn-application-edit">{{d.appName}}' +
                             '  </span>' +
                             '</div>'
                     }, {
-                        field: 'busTypeName', title: '所属业务', align: 'center', sort: true, width: '20%',
+                        field: 'busTypeName', title: '所属业务', align: 'center', sort: true,
                         templet: function (d) {
                             if (d.busType.busTypeName == null) {
                                 return ""
@@ -93,24 +77,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             }
                         }
                     }, {
-                        field: 'appDesc', title: '应用描述', align: 'left', sort: true
+                        field: 'appDesc', title: '应用描述', align: 'center', sort: true
                     }, {
-                        field: 'createTime', title: '创建时间', align: 'center', sort: true, width: '10%'
+                        field: 'createTime', title: '创建时间', align: 'center', sort: true
                     }, {
-                        title: '操作', align: 'center', width: 120, fixed: 'right',
+                        title: '操作', align: 'center',width:120,fixed:'right',
                         templet:
                             '<div>' +
-                            '<button data-id="{{d.appId}}" class="layui-btn layui-btn-xs layui-btn-normal btn-application-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +
+                            '  <span data-id="{{d.appId}}" class="layui-table-link btn-application-delete">删除</span>' +
                             '</div>'
                     }
                 ]],
                 done: function (res) {
                     // 点击编号编辑事件
                     $('.btn-application-edit').click(function () {
-                        if ($.inArray('back:application:update', checkList) == -1) {
-                            layer.msg('暂无权限!', {icon: 7, time: 3000});
-                            return;
-                        }
                         var currentApplication = res.data[$(this).data('index')];
                         delete currentApplication.LAY_TABLE_INDEX;
                         saveApplication('edit', '编辑', currentApplication);
@@ -126,17 +106,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 新增按钮
         $('#application-create').click(function () {
-            if ($.inArray('back:application:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
-                return;
-            }
             saveApplication('insert', '新增')
         });
         // 批量删除按钮
         $('#btn-application-delete').click(function () {
             var deletes = [];
-            $.each(table.checkStatus('table-application-table').data, function (index, value) {
+            $.each(table.checkStatus('application-table').data, function (index, value) {
                 deletes.push(value.appId);
             });
             deleteAppById(deletes);
@@ -170,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             layer.open({
                 type: 1,
                 title: '<a class="layui-icon layui-icon-edit win_title_icon"></a>' + actionName,
-                area: ['40%', '50%'],
+                area: ['970px', '450px'],
                 content: $('#applicationEdit').html(),
                 btn: ['保存', '取消'],
                 success: function (layero, index) {
@@ -224,21 +200,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         form.render();
                         // 应用编号改变判断是否已经存在
                         $('#txt-application-code').change(function () {
-                            var al = checkAppCodeExist($(this).val(), oldAppCode);
-                            if (al == '1') {
+                            if (checkAppCodeExist($(this).val())) {
                                 $(this).val(oldAppCode);
-                                codeIsExist = true;
                                 layer.msg('该编号已存在，请重新输入!', {icon: 2, time: 3000});
-                            } else {
-                                codeIsExist = false;
                             }
                         });
                         // 绑定表单提交事件
                         form.on('submit(application-submit)', function (data) {
-                            if (codeIsExist) {
-                                codeIsExist = false;
-                                return false;
-                            }
                             loading = layer.load(2);
                             application = Object.assign(application, data.field);
                             application.appCode = appCodePrefix + application.appCode;
@@ -258,6 +226,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                 if (response.success) {
                                     layer.msg(actionName + '成功!', {icon: 1, time: 3000});
                                     layer.close(index);
+                                    loadApplicationTable();
                                 } else {
                                     layer.msg(actionName + '失败!', {icon: 2, time: 3000});
                                 }
@@ -269,9 +238,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 yes: function () {
                     // 触发表单提交
                     $('#btn-application-submit').click();
-                },
-                end: function () {
-                    loadApplicationTable();
                 }
             });
@@ -281,20 +247,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
              * @param appCode 应用编号
              * @returns {boolean} 存在: true，不存在: false
              */
-            function checkAppCodeExist(appCode, oldAppCode) {
-                var result = '0';
-                var newAppCode = appCodePrefix + appCode;
+            function checkAppCodeExist(appCode) {
+                var result = true;
                 admin.req({
-                    url: domainName + '/api-web/manage/application/checkout/' + newAppCode,
+                    url: domainName + '/api-web/manage/application/page',
                     async: false,
                     data: {
-                        oldAppCode: oldAppCode
+                        page: 1,
+                        limit: 10,
+                        appCode: appCodePrefix + appCode
                     }
                 }).done(function (response) {
-                    if (response.success == true) {
-                        if (response.count > 0) {
-                            result = '1';
-                        }
+                    if (response.data.length === 0) {
+                        result = false;
                     }
                 });
                 return result;
@@ -307,10 +272,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
          * @param appIds 要删除的应用id
          */
         function deleteAppById(appIds) {
-            if ($.inArray('back:application:delete', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
-                return;
-            }
             if (appIds.length === 0) {
                 layer.msg('请选择您要删除的数据。', {icon: 7, title: '提示'});
                 return;
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/server.js
View file @6ba91b3
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/server.js
View file @6ba91b3
@@ -23,11 +23,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 加载遮罩
         var loading;
-        //获得权限列表
-        var checkList = common.checkPermission(accessToken);
-
-        //服务编码重复标识
-        var codeIsExist = false;
         loadServerTable();
         // 查询条件框回车查询事件
@@ -37,29 +32,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 return false;
             }
         });
-        $("#serverQueryBtn").on("click", function () {
-            loadServerTable();
-        })
         /**
          * 加载服务信息表格
          */
         function loadServerTable() {
-            conditions.serverName = $('#condition-server-name').val() ? $('#condition-server-name').val().trim() : '';
-            conditions.appName = $('#condition-server-name').val() ? $('#condition-server-name').val().trim() : '';
-            conditions.busTypeName = $('#condition-server-name').val() ? $('#condition-server-name').val().trim() : '';
-            conditions.serverDesc = $('#condition-server-name').val() ? $('#condition-server-name').val().trim() : '';
+            conditions.serverName = $('#condition-server-name').val().trim();
             serverTable = table.render({
                 elem: '#server-table',
                 url: domainName + '/api-web/manage/server/page?access_token=' + accessToken,
                 where: conditions,
-                height: 'full-200',
+                height: 'full-250',
                 page: {
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
-                    , theme: '#1E9FFF'//自定义分页主题颜色
+                    ,theme: '#1E9FFF'//自定义分页主题颜色
                 },
-                limit: common.limit,
-                limits: common.limits,
                 cols: [[
                     {
                         type: 'checkbox'
@@ -73,36 +60,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             '  </span>' +
                             '</div>'
                     }, {
-                        field: 'serverName', title: '服务名称', align: 'center', sort: true, width: '15%',
+                        field: 'serverName', title: '服务名称', align: 'center', sort: true
                     }, {
-                        field: 'busTypeName', title: '所属业务', align: 'center', sort: true, width: '15%',
+                        field: 'busTypeName', title: '所属业务', align: 'center', sort: true,
                         templet: function (d) {
                             return d.application.busType.busTypeName;
                         }
                     }, {
-                        field: 'appName', title: '所属应用', align: 'center', sort: true, width: '15%',
+                        field: 'appName', title: '所属应用', align: 'center', sort: true,
                         templet: function (d) {
                             return d.application.appName;
                         }
                     }, {
-                        field: 'serverDesc', title: '服务描述', align: 'left', sort: true
+                        field: 'serverDesc', title: '服务描述', align: 'center', sort: true
                     }, {
-                        field: 'createTime', title: '创建时间', align: 'center', sort: true, width: '10%',
+                        field: 'createTime', title: '创建时间', align: 'center', sort: true
                     }, {
-                        title: '操作', align: 'center', width: 120, fixed: 'right',
+                        title: '操作', align: 'center',width:120,fixed:'right',
                         templet:
                             '<div>' +
-                            '<button data-id="{{d.serverId}}" class="layui-btn layui-btn-xs layui-btn-normal btn-server-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +
+                            '  <span data-id="{{d.serverId}}" class="layui-table-link btn-server-delete">删除</span>' +
                             '</div>'
                     }
                 ]],
                 done: function (res) {
                     // 点击编号编辑事件
                     $('.btn-server-edit').click(function () {
-                        if ($.inArray('back:server:update', checkList) == -1) {
-                            layer.msg('暂无权限!', {icon: 7, time: 3000});
-                            return;
-                        }
                         var currentserver = res.data[$(this).data('index')];
                         delete currentserver.LAY_TABLE_INDEX;
                         saveServer('edit', '编辑', currentserver);
@@ -118,10 +101,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 新增按钮
         $('#btn-server-create').click(function () {
-            if ($.inArray('back:server:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
-                return;
-            }
             saveServer('insert', '新增')
         });
@@ -195,8 +174,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             },
                             data: busTypeList,
                             on: function (data) {
-                                if (!data.isAdd) {
-                                    appSelect.update({data: []});
+                                if(!data.isAdd){
+                                    appSelect.update({data:[]});
                                     return;
                                 }
                                 // 绑定应用下拉框
@@ -219,7 +198,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                     });
                                     appSelect.update({data: appList});
                                 });
-                                if (actionType === 'edit') {
+                                if(actionType === 'edit'){
                                     appSelect.setValue([server.appId], null, true);
                                     actionType = 'edited'
                                 }
@@ -261,22 +240,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         form.render();
                         // 服务编号改变判断是否已经存在
                         $('#txt-server-code').change(function () {
-                            var vl = checkServerCodeExist($(this).val(), oldServerCode);
-                            if (vl == '1') {
+                            if (checkServerCodeExist($(this).val())) {
                                 $(this).val(oldServerCode);
-                                codeIsExist = true;
                                 layer.msg('该编号已存在，请重新输入!', {icon: 2, time: 3000});
-                            } else {
-                                codeIsExist = false;
                             }
                         });
-
                         // 绑定表单提交事件
                         form.on('submit(server-submit)', function (data) {
-                            if (codeIsExist) {
-                                codeIsExist = false;
-                                return false;
-                            }
                             loading = layer.load(2);
                             server = Object.assign(server, data.field);
                             server.serverCode = serverCodePrefix + server.serverCode;
@@ -308,9 +278,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 yes: function () {
                     // 触发表单提交
                     $('#btn-server-submit').click();
-                },
-                end: function () {
-                    loadServerTable();
                 }
             });
@@ -320,20 +287,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
              * @param serverCode 服务编号
              * @returns {boolean} 存在: true，不存在: false
              */
-            function checkServerCodeExist(serverCode, oldServerCode) {
-                var result = '0';
-                var newServerCode = serverCodePrefix + serverCode;
+            function checkServerCodeExist(serverCode) {
+                var result = true;
                 admin.req({
-                    url: domainName + '/api-web/manage/server/checkout/' + newServerCode,
+                    url: domainName + '/api-web/manage/server/page',
                     async: false,
                     data: {
-                        oldServerCode: oldServerCode
+                        page: 1,
+                        limit: 10,
+                        serverCode: serverCodePrefix + serverCode
                     }
                 }).done(function (response) {
-                    if (response.success == true) {
-                        if (response.count > 0) {
-                            result = '1';
-                        }
+                    if (response.data.length === 0) {
+                        result = false;
                     }
                 });
                 return result;
@@ -346,10 +312,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
          * @param serverIds 要删除的服务id
          */
         function deleteserverById(serverIds) {
-            if ($.inArray('back:server:delete', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
-                return;
-            }
             if (serverIds.length === 0) {
                 layer.msg('请选择您要删除的数据。', {icon: 7, title: '提示'});
                 return;
@@ -377,12 +339,5 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 });
             })
         }
-
-        //获取选中的数据
-        function getCheckData() {
-            return table.checkStatus('server-table').data;
-        }
-
-        return {getData: getCheckData};
     });
 });
--- a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/application/index.html
View file @6ba91b3
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/application/index.html
View file @6ba91b3
@@ -9,16 +9,9 @@
               <div class="layui-form-item">
                 <div class="layui-inline">
                   <div class="layui-input-inline layui-input-inline--long">
-                                        <input autocomplete="off" class="layui-input" id="condition-app-name"
-                                               lay-tips='关键字检索包括:<br>应用名称</br>所属业务</br>应用描述' placeholder="输入关键字，回车搜索"
-                                               type="text">
+                    <input type="text" id="condition-app-name" placeholder="输入关键字，回车搜索"  autocomplete="off" class="layui-input">
                   </div>
                 </div>
-                                <div class="layui-inline">
-                                    <button class="layui-btn layui-btn-normal" id="applicationQueryBtn" type="button"><i
-                                            class="layui-icon layui-icon-search"></i>查询
-                                    </button>
-                                </div>
               </div>
             </form>
           </div>
@@ -32,7 +25,7 @@
               <i class="layui-icon">&#xe640;</i>删除
             </button>
           </div>
-                    <table id="table-application-table" lay-filter="applicationtable"></table>
+          <table id="application-table" lay-filter="applicationtable"></table>
         </div>
       </div>
     </div>
@@ -40,7 +33,7 @@
 </article>
 <!--新增/编辑弹出框-->
-<script id="applicationEdit" type="text/html">
+<script type="text/html" id="applicationEdit">
   <div class="layui-card">
     <form class="layui-form form-edit layui-form-pane" action="" lay-filter="form-application-edit">
       <div class="layui-form-item">
@@ -54,22 +47,19 @@
         <label class="layui-form-label">应用编号</label>
         <label class="form-input-prefix" id="txt-appcode-prefix"></label>
         <div class="layui-input-block input-flex-1">
-                    <input type="text" id="txt-application-code" name="appCode" required lay-verify="required"
-                           placeholder="请输入编号" autocomplete="off" class="layui-input">
+          <input type="text" id="txt-application-code" name="appCode" required lay-verify="required" placeholder="请输入编号" autocomplete="off" class="layui-input">
         </div>
       </div>
       <div class="layui-form-item">
         <label class="layui-form-label">应用名称</label>
         <div class="layui-input-block">
-                    <input type="text" id="txt-application-name" name="appName" lay-verify="required"
-                           placeholder="请输入名称" class="layui-input">
+          <input type="text" id="txt-application-name" name="appName" lay-verify="required" placeholder="请输入名称" class="layui-input">
         </div>
       </div>
       <div class="layui-form-item">
         <label class="layui-form-label textarea-label">应用描述</label>
         <div class="layui-input-block">
-                    <textarea name="appDesc" placeholder="请输入应用描述" class="layui-textarea" lay-verify="required"
-                              style="height:auto"></textarea>
+          <textarea name="appDesc" placeholder="请输入应用描述" class="layui-textarea" lay-verify="required"></textarea>
         </div>
       </div>
       <button id="btn-application-submit" class="hide" lay-submit lay-filter="application-submit">提交</button>
--- a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/server/index.html
View file @6ba91b3
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/server/index.html
View file @6ba91b3
@@ -9,16 +9,9 @@
                             <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline layui-input-inline--long">
-                                        <input autocomplete="off" class="layui-input" id="condition-server-name"
-                                               lay-tips='关键字检索包括:<br>服务名称</br>所属业务</br>所属应用</br>服务描述' placeholder="输入关键字，回车搜索"
-                                               type="text">
+                                        <input type="text" id="condition-server-name" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <button class="layui-btn layui-btn-normal" id="serverQueryBtn" type="button">
-                                        <i class="layui-icon layui-icon-search"></i>查询
-                                    </button>
-                                </div>
                             </div>
                         </form>
                     </div>
@@ -40,7 +33,7 @@
 </article>
 <!--新增/编辑弹出框-->
-<script id="serverEdit" type="text/html">
+<script type="text/html" id="serverEdit">
     <div class="layui-card">
         <form class="layui-form layui-form-pane" action="" lay-filter="form-server-edit">
             <div class="layui-form-item">
@@ -61,22 +54,19 @@
                 <label class="layui-form-label">服务编号</label>
                 <label class="form-input-prefix" id="txt-servercode-prefix"></label>
                 <div class="layui-input-block input-flex-1">
-                    <input type="text" id="txt-server-code" name="serverCode" required lay-verify="required"
-                           placeholder="请输入编号" autocomplete="off" class="layui-input">
+                    <input type="text" id="txt-server-code" name="serverCode" required lay-verify="required" placeholder="请输入编号" autocomplete="off" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">服务名称</label>
                 <div class="layui-input-block">
-                    <input type="text" id="txt-server-name" name="serverName" lay-verify="required" placeholder="请输入名称"
-                           class="layui-input">
+                    <input type="text" id="txt-server-name" name="serverName" lay-verify="required" placeholder="请输入名称" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label textarea-label">服务描述</label>
                 <div class="layui-input-block">
-                    <textarea name="serverDesc" placeholder="请输入服务描述" class="layui-textarea"
-                              lay-verify="required"></textarea>
+                    <textarea name="serverDesc" placeholder="请输入服务描述" class="layui-textarea" lay-verify="required"></textarea>
                 </div>
             </div>
             <button id="btn-server-submit" class="hide" lay-submit lay-filter="server-submit">提交</button>