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

中间件-【无】weblogic查询 See merge request !919

Merge branch 'master-500-dev-xwx' into 'master-500-dev'
中间件-【无】weblogic查询 See merge request !919
王涛
Commit 63485a7699ead29f7b7d436ac927b5c02563f774 2 parents 2cb53cb8 8708f756
Showing 2 changed files with 33 additions and 12 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/bizreslist.js
hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/bizreslist.js
View file @63485a7
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/bizreslist.js
View file @63485a7
@@ -9,7 +9,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
     var common = layui.common;
     var commonCols = layui.commonCols;
     var sortKey = '';
-    var fieldExpandArr=[];//获取扩展的表格字段
+    var fieldExpandArr = [];//获取扩展的表格字段
     //用树表格展示的资源类型
     var treeTableResTypes = [
@@ -32,7 +32,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
         var parentResType = router.search.restype
         var activeResType = '', listTable = null, treeListTable = null;
-
+        var parentId = 'null';
         //绑定检索事件
         bindSearchEvent();
         var collProtocols = "";
@@ -115,8 +115,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             }
             renderSearchCondition(resType, bizId);
+            let colResType = resType;
+            if (colResType == 'MIDDLEWARE_WEBLOGIC' &&  parentId == 'null') {
+                colResType = 'MIDDLEWARE_WEBLOGICCONSOLE'
+            }
-            var cols = commonCols.resTypeCls[resType];
+            var cols = commonCols.resTypeCls[colResType];
             //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
             admin.req({
                 url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
@@ -171,7 +175,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                             resHealth: $("#biz_reslist_resStatus").val(),
                             busId: bizId,
                             colonlyId: $("#biz_reslist_res_colony").val(),
-                            parentId: $("#biz_reslist_res_cluster").val(),
+                            parentId: parentId,
                             linkState: $("#biz_reslist_link_state").val(),
                             state: $("#biz_reslist_state").val(),
                             // hostState: $("#biz_reslist_host_state").val(),
@@ -217,7 +221,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                         }
                     });
                 })
-            },300)
+            }, 300)
         }
@@ -292,7 +296,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                     }
                 }
             });
-            setTimeout(function (){
+            setTimeout(function () {
                 //获取配置的列
                 common.getTableCols({
                     domId: 'bizResTreeTable',
@@ -431,7 +435,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                         layer.closeAll();
                     });
                 })
-            },300)
+            }, 300)
         }
         //获取资源统计
@@ -466,6 +470,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             });
             //集群选择事件
             form.on('select(biz_reslist_res_cluster)', function (data) {
+                parentId = $('#biz_reslist_res_cluster').val();
+                renderList(bizId, activeResType)
                 reloadTable();
             });
             //资源池选择事件
@@ -504,7 +510,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             $('#biz_reslist_keyword').val('');
             $('#biz_reslist_resStatus').val('');
             $('#biz_reslist_res_colony').val('');
-            $('#biz_reslist_res_cluster').val('null');
             $("#aliyun_plantform").val('');
             if (collProtocols) {
                 xmSelect.get('#collProtocolSelect', true).setValue([]);
@@ -530,8 +535,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                 $("#biz_reslist_res_cluster_id").show();
             } else if (resType == 'MIDDLEWARE_WEBLOGIC') {
                 searchType = 'MIDDLEWARE_WEBLOGIC';
-                optons = "<option value=''>=全部服务=</option>"
-                optons += "<option value='null'>=全部控制台=</option>"
+                optons = "<option value='null'>=全部控制台=</option>"
+                optons += "<option value=''>全部服务</option>"
                 targetId = 'biz_reslist_res_cluster';
                 $("#biz_reslist_res_cluster_id").show();
             } else {
@@ -663,7 +668,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                     resHealth: $("#biz_reslist_resStatus").val(),
                     busId: bizId,
                     colonlyId: $("#biz_reslist_res_colony").val(),
-                    parentId: $("#biz_reslist_res_cluster").val(),
+                    parentId: parentId,
                     sortKey: sortKey,
                     state: $("#biz_reslist_state").val(),
                     linkState: $("#biz_reslist_link_state").val(),
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @63485a7
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @63485a7
@@ -2975,7 +2975,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                     sort: true,
                     templet: '#weblogicIpTpl'
                 },
-                {field: 'resName', title: '资源名称', minWidth: x_200, sort: true, templet: '#webLogicResNameTpl'},
+                {field: 'resName', title: '资源名称', minWidth: x_200, sort: true,
+                    templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'},
                 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
                 {field: 'serverState', title: '服务状态', minWidth: x_120, align: 'center', sort: true},
                 {field: 'queueLength', title: '队列长度', minWidth: x_110, align: 'center', templet: '#queueLengthTpl'},
@@ -3019,6 +3020,21 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                     sort: true
                 }
             ],
+            "MIDDLEWARE_WEBLOGICCONSOLE": [
+                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {
+                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
+                },
+                {field: 'shortName', title: '别名', minWidth: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
+                {field: 'health', title: '健康状态', minWidth: 83, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: 161, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: 101, align: 'center'},
+                {field: 'weblogicVersion', title: 'weblogic版本号', align: 'center', width: 135, sort: true},
+                {field: 'patchId', title: '反序列化补丁版本号', align: 'center', width: 83, sort: true},
+                {field: 'javaVersion', title: 'Java版本号', align: 'center', width: 100, sort: true},
+                {field: 'state', title: '资源状态', minWidth: 98, align: 'center', sort: true, templet: '#resStateTpl'}
+            ],
             "MIDDLEWARE_TOMCAT": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},