添加设备日志类型筛选

db/menu.sql

@@ -76,7 +76,7 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'pla
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'device-manager', '设备管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'portal-manager', '门户管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'log-manager', '日志管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'sample-manager', '样表管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'sample-form-manager', '样表管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'fill-manager', '填单管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'refined-manager', '精细化管理服务', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'log_wechat', '微官网/预约', 1, 4, 0, 'level', NULL, NULL, NULL);
@@ -87,3 +87,23 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'pla
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'log_pjdevice', '评价系统', 1, 4, 0, 'level', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '平台标识', 'OperateLog', 'platformMark', 'log_guide', '导视系统', 1, 4, 0, 'level', NULL, NULL, NULL);
 
+
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'pdj', '排队机', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'ckp', '窗口屏', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'hjq', '呼叫器', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'jzxsp', '集中显示屏', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'pjq', '评价器', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'xxfbp', '信息发布屏', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'dsj', '导视机', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'zzfwzd', '自助服务终端', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'tdj', '填单机', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'ybj', '样表机', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'ymt', '一码通', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'ledtp', 'LED通屏', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'qjg', '取件柜', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'bkb', '背靠背评价设备', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'zzfwzd', '自助终端', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'zmszzfwzd', '桌面式自助服务终端', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'dzmp', '电子门牌', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'hysdzmp', '会议室电子门牌', 1, 4, 0, 'level', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用标识', 'BizLog', 'appName', 'device-manager', '设备管理系统', 1, 4, 0, 'level', NULL, NULL, NULL);

log-manager-ui/admin/src/views/error/log/list.vue

@@ -50,12 +50,11 @@
                             label: "TraceId",
                             fuzzy: true
                         },
-                        {
-                            name: "appName",
-                            type: "text",
-                            label: "应用标识",
-                            fuzzy: true
-                        },
+                      {
+                        name: "appName",
+                        type: "select",
+                        label: "应用名称"
+                      },
                         {
                             name: "message",
                             type: "text",
@@ -67,7 +66,7 @@
                     
                         {type: "index",label: "序号",align:"center",width: 50},
 
-                        {label: "追踪Id", prop: "traceID"},
+                        {label: "追踪Id", prop: "id"},
 
                         {label: "应用名称", prop: "appName"},
 

log-manager/src/main/java/com/mortals/xhx/module/biz/web/BizLogController.java

@@ -43,7 +43,7 @@ public class BizLogController extends BaseCRUDJsonBodyMappingController<BizLogSe
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "appName", paramService.getParamBySecondOrganize("OperateLog","appName"));
+        this.addDict(model, "appName", paramService.getParamBySecondOrganize("BizLog","appName"));
         super.init(model, context);
     }
 

log-manager/src/main/java/com/mortals/xhx/module/error/web/ErrorLogController.java

@@ -46,7 +46,7 @@ public class ErrorLogController extends BaseCRUDJsonBodyMappingController<ErrorL
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "platform", paramService.getParamBySecondOrganize("ErrorLog","platform"));
         this.addDict(model, "level", paramService.getParamBySecondOrganize("ErrorLog","level"));
-        this.addDict(model, "appName", paramService.getParamBySecondOrganize("OperateLog","platformMark"));
+        this.addDict(model, "appName", paramService.getParamBySecondOrganize("BizLog","appName"));
         super.init(model, context);
     }