fix: 日志管理过滤字段完善

云中非
1 parent 63acf7d8
Showing 6 changed files with 59 additions and 55 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtSyslogController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SysLogDTO.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSysLogServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/YtSysLogMapper.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtSysLogService.java
dao/src/main/resources/mapper/YtSysLogMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtSyslogController.java
View file @2aaca61
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtSyslogController.java
View file @2aaca61
@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.audit.AuditLog;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -36,72 +36,76 @@ public class YtSyslogController extends BaseController {
         return logService.detail(entityId);
     }
-    @GetMapping(value="exception",params = {PAGE_SIZE, PAGE})
+    @GetMapping(value = "exception", params = {PAGE_SIZE, PAGE})
     @ApiOperation("异常日志列表")
     @PreAuthorize("@check.checkPermissions({},{})")
     public YtPageData<SysLogDTO> pageExceptions(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime,
             @RequestParam(value = "actionType", required = false) ActionType actionType,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
             throws ThingsboardException {
-        if(StringUtils.isEmpty(orderBy)){
+        if (StringUtils.isEmpty(orderBy)) {
             orderBy = ModelConstants.CREATED_TIME_PROPERTY;
         }
         IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
-        return logService.exceptionPage(pageInfrom, null,null
-                ,getCurrentUser().isPtTenantAdmin()?getCurrentUser().getCurrentTenantId():null
-                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
-                ,actionType);
+        return logService.exceptionPage(pageInfrom, startTime, endTime
+                , getCurrentUser().isPtTenantAdmin() ? getCurrentUser().getCurrentTenantId() : null
+                , getCurrentUser().isCustomerUser() ? getCurrentUser().getCurrentUserId() : null
+                , actionType);
     }
-    @GetMapping(value="operate",params = {PAGE_SIZE, PAGE})
+    @GetMapping(value = "operate", params = {PAGE_SIZE, PAGE})
     @ApiOperation("操作日志列表")
     @PreAuthorize("@check.checkPermissions({},{})")
     public YtPageData<SysLogDTO> pageOperate(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime,
+            @RequestParam(value = "entityType", required = false) EntityType entityType,
             @RequestParam(value = "actionType", required = false) ActionType actionType,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
             throws ThingsboardException {
-        if(StringUtils.isEmpty(orderBy)){
+        if (StringUtils.isEmpty(orderBy)) {
             orderBy = ModelConstants.CREATED_TIME_PROPERTY;
         }
         IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
-        return logService.operatePage(pageInfrom, null,null
-                ,getCurrentUser().isPtTenantAdmin()?getCurrentUser().getCurrentTenantId():null
-                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
-                ,actionType);
+        return logService.operatePage(pageInfrom, startTime, endTime
+                , getCurrentUser().isPtTenantAdmin() ? getCurrentUser().getCurrentTenantId() : null
+                , getCurrentUser().isCustomerUser() ? getCurrentUser().getCurrentUserId() : null
+                , entityType, actionType);
     }
-    @GetMapping(value="user",params = {PAGE_SIZE, PAGE})
+    @GetMapping(value = "user", params = {PAGE_SIZE, PAGE})
     @ApiOperation("登录登出列表")
     @PreAuthorize("@check.checkPermissions({},{})")
     public YtPageData<SysLogDTO> pageLogin(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
+            @RequestParam(value = "startTime", required = false) Long startTime,
+            @RequestParam(value = "endTime", required = false) Long endTime,
             @RequestParam(value = "actionType", required = false) ActionType actionType,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
             throws ThingsboardException {
-        if(StringUtils.isEmpty(orderBy)){
+        if (StringUtils.isEmpty(orderBy)) {
             orderBy = ModelConstants.CREATED_TIME_PROPERTY;
         }
         IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
-        return logService.loginPage(pageInfrom, null,null
-                ,getCurrentUser().isPtTenantAdmin()?getCurrentUser().getCurrentTenantId():null
-                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
-                ,actionType);
+        return logService.loginPage(pageInfrom, startTime, endTime
+                , getCurrentUser().isPtTenantAdmin() ? getCurrentUser().getCurrentTenantId() : null
+                , getCurrentUser().isCustomerUser() ? getCurrentUser().getCurrentUserId() : null
+                , actionType);
     }
-
-
-
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SysLogDTO.java
View file @2aaca61
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SysLogDTO.java
View file @2aaca61
 /**
  * Copyright © 2016-2021 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.EntityType;
@@ -30,31 +31,38 @@ import java.util.UUID;
 @Data
 public class SysLogDTO extends BaseDTO {
-
+    @ApiModelProperty(value = "操作时间")
     private long createdTime;
-    private EntityType entityType;
     private UUID tenantId;
+    @ApiModelProperty(value = "租户名称")
     private String tenantName;
     private UUID customerId;
+    @ApiModelProperty(value = "客户名称")
     private String customerName;
+    @ApiModelProperty(value = "资源类型")
+    private EntityType entityType;
     private UUID entityId;
+    @ApiModelProperty(value = "资源名称")
     private String entityName;
     private UUID userId;
+    @ApiModelProperty(value = "操作人员")
     private String userName;
-
+    @ApiModelProperty(value = "操作类型")
     private ActionType actionType;
+    @ApiModelProperty(value = "操作数据")
     private JsonNode actionData;
+    @ApiModelProperty(value = "操作状态")
     private ActionStatus actionStatus;
-
+    @ApiModelProperty(value = "失败信息")
     private String actionFailureDetails;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSysLogServiceImpl.java
View file @2aaca61
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSysLogServiceImpl.java
View file @2aaca61
 package org.thingsboard.server.dao.yunteng.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.audit.AuditLog;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
-import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
 import org.thingsboard.server.dao.yunteng.mapper.YtSysLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtSysLogService;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 @Slf4j
 @Service
@@ -39,26 +31,26 @@ public class YtSysLogServiceImpl extends AbstractBaseService<YtSysLogMapper, Sys
     @Override
     public YtPageData<SysLogDTO> exceptionPage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType) {
         IPage<SysLogDTO> page =
-                baseMapper.getPageDatasMatched(pageInfrom, tenantId,customerId,startTime,endTime,EntityType.RUNNING_EXCEPTION,actionType);
+                baseMapper.getPageDatasMatched(pageInfrom, tenantId, customerId, startTime, endTime, EntityType.RUNNING_EXCEPTION, actionType);
         return getPageData(page, SysLogDTO.class);
     }
     @Override
-    public YtPageData<SysLogDTO> operatePage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType) {
+    public YtPageData<SysLogDTO> operatePage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, EntityType entityType, ActionType actionType) {
         List<EntityType> entityTypes = new ArrayList<>();
         entityTypes.add(EntityType.RUNNING_EXCEPTION);
         entityTypes.add(EntityType.USER);
         IPage<SysLogDTO> page =
-                baseMapper.getPageDatasNot(pageInfrom, tenantId,customerId,startTime,endTime,actionType, entityTypes);
+                baseMapper.getPageDatasNot(pageInfrom, tenantId, customerId, startTime, endTime, entityType, actionType, entityTypes);
         return getPageData(page, SysLogDTO.class);
     }
     @Override
     public YtPageData<SysLogDTO> loginPage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType) {
         IPage<SysLogDTO> page =
-                baseMapper.getPageDatasMatched(pageInfrom, tenantId,customerId,startTime,endTime,EntityType.USER,actionType);
+                baseMapper.getPageDatasMatched(pageInfrom, tenantId, customerId, startTime, endTime, EntityType.USER, actionType);
         return getPageData(page, SysLogDTO.class);
     }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/YtSysLogMapper.java
View file @2aaca61
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/YtSysLogMapper.java
View file @2aaca61
@@ -6,12 +6,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.audit.AuditLog;
-import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtRpcRecordDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
-import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
 import java.util.List;
@@ -21,12 +17,11 @@ import java.util.List;
 @Mapper
 public interface YtSysLogMapper extends BaseMapper<SysLogEntity> {
     IPage<SysLogDTO> getPageDatasMatched(IPage<?> page, @Param("tenantId") String tenantId, @Param("customerId") String customerId
-            , @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("entityType") EntityType entityType, @Param("actionType")  ActionType actionType);
-    IPage<SysLogDTO> getPageDatasNot(IPage<?> page, @Param("tenantId") String tenantId, @Param("customerId") String customerId
-            , @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("actionType")  ActionType actionType, @Param("entityType") List<EntityType> entityType);
-
+            , @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("entityType") EntityType entityType, @Param("actionType") ActionType actionType);
+    IPage<SysLogDTO> getPageDatasNot(IPage<?> page, @Param("tenantId") String tenantId, @Param("customerId") String customerId
+            , @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("entityFilter") EntityType entityFilter, @Param("actionType") ActionType actionType, @Param("entityType") List<EntityType> entityType);
-    SysLogDTO detailById( @Param("entityId") String entityId);
+    SysLogDTO detailById(@Param("entityId") String entityId);
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtSysLogService.java
View file @2aaca61
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtSysLogService.java
View file @2aaca61
 package org.thingsboard.server.dao.yunteng.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.audit.AuditLog;
 import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
-import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
 public interface YtSysLogService extends BaseService<SysLogEntity> {
@@ -43,7 +42,7 @@ public interface YtSysLogService extends BaseService<SysLogEntity> {
      * @param actionType 日志类型
      * @return
      */
-    YtPageData<SysLogDTO> operatePage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType);
+    YtPageData<SysLogDTO> operatePage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, EntityType entityType, ActionType actionType);
     /**
      * 登录日志列表
--- a/dao/src/main/resources/mapper/YtSysLogMapper.xml
View file @2aaca61
+++ b/dao/src/main/resources/mapper/YtSysLogMapper.xml
View file @2aaca61
@@ -25,7 +25,7 @@
     <sql id="baseColumn">
         base.id, base.tenant_id, base.created_time, base.customer_id, base.entity_type, base.entity_id, base.entity_name, base.user_id, base.user_name, base.action_type, base.action_status
-        ,ten.title tenant_name
+        ,ten.title tenant_name,cus.title customer_name
     </sql>
     <sql id="detailColumn">
         <include refid="baseColumn"></include>
@@ -36,6 +36,7 @@
         SELECT  <include refid="baseColumn"/>
         FROM audit_log base
         LEFT JOIN tenant ten ON base.tenant_id = ten.id
+        LEFT JOIN customer cus ON base.customer_id = cus.id
         <where>
             base.entity_type = #{entityType}
             <if test="tenantId !=null and tenantId !=''">
@@ -61,12 +62,16 @@
         SELECT  <include refid="baseColumn"/>
         FROM audit_log base
         LEFT JOIN tenant ten ON base.tenant_id = ten.id
+        LEFT JOIN customer cus ON base.customer_id = cus.id
         <where>
             base.entity_type
             NOT IN
             <foreach collection="entityType" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            <if test="entityFilter !=null">
+                AND base.entity_type = #{entityFilter}
+            </if>
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}::uuid
             </if>
@@ -89,6 +94,7 @@
         SELECT  <include refid="detailColumn"/>
         FROM audit_log base
         LEFT JOIN tenant ten ON base.tenant_id = ten.id
+        LEFT JOIN customer cus ON base.customer_id = cus.id
         <where>
             base.id = #{entityId}::uuid