Merge branch '20220615' into 'master'

20220615

See merge request huang/thingsboard3.3.2!107

@@ -331,7 +331,7 @@ public abstract class BaseController {
     }
 
     <T> T checkNotNull(Optional<T> reference) throws ThingsboardException {
-        return checkNotNull(reference, "Requested item wasn't found!");
+        return checkNotNull(reference, "请求的内容不存在!");
     }
 
     <T> T checkNotNull(Optional<T> reference, String notFoundMessage) throws ThingsboardException {
@@ -344,13 +344,13 @@ public abstract class BaseController {
 
     void checkParameter(String name, String param) throws ThingsboardException {
         if (StringUtils.isEmpty(param)) {
-            throw new ThingsboardException("Parameter '" + name + "' can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            throw new ThingsboardException("参数【 " + name + "】不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
     }
 
     void checkArrayParameter(String name, String[] params) throws ThingsboardException {
         if (params == null || params.length == 0) {
-            throw new ThingsboardException("Parameter '" + name + "' can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            throw new ThingsboardException("参数【 " + name + "】不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         } else {
             for (String param : params) {
                 checkParameter(name, param);
@@ -369,7 +369,7 @@ public abstract class BaseController {
                 try {
                     direction = SortOrder.Direction.valueOf(sortOrder.toUpperCase());
                 } catch (IllegalArgumentException e) {
-                    throw new ThingsboardException("Unsupported sort order '" + sortOrder + "'! Only 'ASC' or 'DESC' types are allowed.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                    throw new ThingsboardException("不支持的排序规则【" + sortOrder + "】!只支持 'ASC' 或 'DESC'.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
                 }
             }
             SortOrder sort = new SortOrder(sortProperty, direction);
@@ -390,7 +390,7 @@ public abstract class BaseController {
         if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
             return (SecurityUser) authentication.getPrincipal();
         } else {
-            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+            throw new ThingsboardException("你没有权限执行改操作!", ThingsboardErrorCode.AUTHENTICATION);
         }
     }
 
@@ -398,7 +398,7 @@ public abstract class BaseController {
         try {
             validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
             Tenant tenant = tenantService.findTenantById(tenantId);
-            checkNotNull(tenant, "Tenant with id [" + tenantId + "] is not found");
+            checkNotNull(tenant, "ID【" + tenantId + "】相关的租户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation, tenantId, tenant);
             return tenant;
         } catch (Exception e) {
@@ -410,7 +410,7 @@ public abstract class BaseController {
         try {
             validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
             TenantInfo tenant = tenantService.findTenantInfoById(tenantId);
-            checkNotNull(tenant, "Tenant with id [" + tenantId + "] is not found");
+            checkNotNull(tenant, "ID【" + tenantId + "】相关的租户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation, tenantId, tenant);
             return tenant;
         } catch (Exception e) {
@@ -420,9 +420,9 @@ public abstract class BaseController {
 
     TenantProfile checkTenantProfileId(TenantProfileId tenantProfileId, Operation operation) throws ThingsboardException {
         try {
-            validateId(tenantProfileId, "Incorrect tenantProfileId " + tenantProfileId);
+            validateId(tenantProfileId, "错误的租户配置ID " + tenantProfileId);
             TenantProfile tenantProfile = tenantProfileService.findTenantProfileById(getTenantId(), tenantProfileId);
-            checkNotNull(tenantProfile, "Tenant profile with id [" + tenantProfileId + "] is not found");
+            checkNotNull(tenantProfile, "ID【" + tenantProfileId + "】相关的租户配置不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, operation);
             return tenantProfile;
         } catch (Exception e) {
@@ -436,9 +436,9 @@ public abstract class BaseController {
 
     protected Customer checkCustomerId(CustomerId customerId, Operation operation) throws ThingsboardException {
         try {
-            validateId(customerId, "Incorrect customerId " + customerId);
+            validateId(customerId, "客户ID不正确 " + customerId);
             Customer customer = customerService.findCustomerById(getTenantId(), customerId);
-            checkNotNull(customer, "Customer with id [" + customerId + "] is not found");
+            checkNotNull(customer, "ID【" + customerId + "】相关的客户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.CUSTOMER, operation, customerId, customer);
             return customer;
         } catch (Exception e) {
@@ -448,9 +448,9 @@ public abstract class BaseController {
 
     protected User checkUserId(UserId userId, Operation operation) throws ThingsboardException {
         try {
-            validateId(userId, "Incorrect userId " + userId);
+            validateId(userId, "用户ID不正确 " + userId);
             User user = userService.findUserById(getCurrentUser().getTenantId(), userId);
-            checkNotNull(user, "User with id [" + userId + "] is not found");
+            checkNotNull(user, "ID【" + userId + "】相关的用户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.USER, operation, userId, user);
             return user;
         } catch (Exception e) {
@@ -470,9 +470,9 @@ public abstract class BaseController {
     protected void checkEntityId(EntityId entityId, Operation operation) throws ThingsboardException {
         try {
             if (entityId == null) {
-                throw new ThingsboardException("Parameter entityId can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                throw new ThingsboardException("参数entityId不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
             }
-            validateId(entityId.getId(), "Incorrect entityId " + entityId);
+            validateId(entityId.getId(), "entityId不正确 " + entityId);
             switch (entityId.getEntityType()) {
                 case ALARM:
                     checkAlarmId(new AlarmId(entityId.getId()), operation);
@@ -526,7 +526,7 @@ public abstract class BaseController {
                     checkOtaPackageId(new OtaPackageId(entityId.getId()), operation);
                     return;
                 default:
-                    throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType());
+                    throw new IllegalArgumentException("不支持的资源类型: " + entityId.getEntityType());
             }
         } catch (Exception e) {
             throw handleException(e, false);
@@ -535,9 +535,9 @@ public abstract class BaseController {
 
     public Device checkDeviceId(DeviceId deviceId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceId, "Incorrect deviceId " + deviceId);
+            validateId(deviceId, "deviceId不正确 " + deviceId);
             Device device = deviceService.findDeviceById(getCurrentUser().getTenantId(), deviceId);
-            checkNotNull(device, "Device with id [" + deviceId + "] is not found");
+            checkNotNull(device, "ID【" + deviceId + "】相关的设备不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE, operation, deviceId, device);
             return device;
         } catch (Exception e) {
@@ -547,9 +547,9 @@ public abstract class BaseController {
 
     DeviceInfo checkDeviceInfoId(DeviceId deviceId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceId, "Incorrect deviceId " + deviceId);
+            validateId(deviceId, "deviceId不正确" + deviceId);
             DeviceInfo device = deviceService.findDeviceInfoById(getCurrentUser().getTenantId(), deviceId);
-            checkNotNull(device, "Device with id [" + deviceId + "] is not found");
+            checkNotNull(device, "ID【" + deviceId + "】相关的设备不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE, operation, deviceId, device);
             return device;
         } catch (Exception e) {
@@ -559,9 +559,9 @@ public abstract class BaseController {
 
     protected DeviceProfile checkDeviceProfileId(DeviceProfileId deviceProfileId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceProfileId, "Incorrect deviceProfileId " + deviceProfileId);
+            validateId(deviceProfileId, "设备配置Id不正确 " + deviceProfileId);
             DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(getCurrentUser().getTenantId(), deviceProfileId);
-            checkNotNull(deviceProfile, "Device profile with id [" + deviceProfileId + "] is not found");
+            checkNotNull(deviceProfile, "ID【" + deviceProfileId + "】相关的设备配置不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE_PROFILE, operation, deviceProfileId, deviceProfile);
             return deviceProfile;
         } catch (Exception e) {

@@ -84,7 +84,7 @@ public class YtMenuController extends BaseController {
   @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
   public void deleteMenus(@RequestBody String[] ids) throws ThingsboardException {
     if (ids.length == 0) {
-      throw new YtDataValidationException("please provide menu ids to delete");
+      throw new YtDataValidationException("需要删除的菜单不能为空");
     }
     menuService.deleteMenus(getCurrentUser().getCurrentTenantId(), ids);
   }

+package org.thingsboard.server.controller.yunteng;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.SysLogDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
+import org.thingsboard.server.dao.yunteng.service.YtSysLogService;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequestMapping("api/yt/log")
+@Api(tags = {"日志管理"})
+@RequiredArgsConstructor
+public class YtSyslogController extends BaseController {
+
+    private final YtSysLogService logService;
+
+    @GetMapping("{entityId}")
+    @PreAuthorize("@check.checkPermissions({},{})")
+    @ApiOperation("详情")
+    public SysLogDTO detail(@PathVariable("entityId") String entityId)
+            throws ThingsboardException {
+        return logService.detail(entityId);
+    }
+
+    @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)) {
+            orderBy = ModelConstants.CREATED_TIME_PROPERTY;
+        }
+        IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
+        return logService.exceptionPage(pageInfrom, startTime, endTime
+                , getCurrentUser().isPtTenantAdmin() ? getCurrentUser().getCurrentTenantId() : null
+                , getCurrentUser().isCustomerUser() ? getCurrentUser().getCurrentUserId() : null
+                , actionType);
+    }
+
+    @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)) {
+            orderBy = ModelConstants.CREATED_TIME_PROPERTY;
+        }
+        IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
+        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})
+    @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)) {
+            orderBy = ModelConstants.CREATED_TIME_PROPERTY;
+        }
+        IPage<SysLogEntity> pageInfrom = logService.getPage(page, pageSize, orderBy, orderType);
+        return logService.loginPage(pageInfrom, startTime, endTime
+                , getCurrentUser().isPtTenantAdmin() ? getCurrentUser().getCurrentTenantId() : null
+                , getCurrentUser().isCustomerUser() ? getCurrentUser().getCurrentUserId() : null
+                , actionType);
+    }
+
+
+}

@@ -150,7 +150,7 @@ public class OperateLogAspect {
         if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
             return (SecurityUser) authentication.getPrincipal();
         } else {
-            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+            throw new ThingsboardException("你没有权限执行该操作!", ThingsboardErrorCode.AUTHENTICATION);
         }
     }
 

+/**
+ * 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
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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;
+import org.thingsboard.server.common.data.audit.ActionStatus;
+import org.thingsboard.server.common.data.audit.ActionType;
+
+import java.util.UUID;
+
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SysLogDTO extends BaseDTO {
+
+    @ApiModelProperty(value = "操作时间")
+    private long createdTime;
+
+
+    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;
+
+
+}

@@ -4,5 +4,6 @@ package org.thingsboard.server.common.data.yunteng.enums;
 public enum ActTypeEnum {
   FLASH,
   ROTATE,
-  DISPLAY
+  DISPLAY,
+  IMAGE
 }

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.audit.ActionStatus;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.audit.AuditLog;
+import org.thingsboard.server.common.data.id.*;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.dao.model.BaseSqlEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.util.mapping.JsonStringType;
+
+import javax.persistence.*;
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.AUDIT_LOG_COLUMN_FAMILY_NAME)
+public class SysLogEntity  extends BaseEntity {
+
+
+    private UUID tenantId;
+
+    private long createdTime;
+    private UUID customerId;
+
+    private EntityType entityType;
+
+
+    private UUID entityId;
+
+
+    private String entityName;
+
+
+    private UUID userId;
+
+    private String userName;
+
+
+    private ActionType actionType;
+
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode actionData;
+
+    private ActionStatus actionStatus;
+
+
+    private String actionFailureDetails;
+
+
+}

@@ -71,7 +71,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
                 baseMapper.selectCount(
                         new QueryWrapper<Role>().lambda().ne(Role::getTenantId, tenantId).in(Role::getId, ids));
         if (notTenantMenuCount > 0) {
-            throw new AccessDeniedException("cannot delete role that not create by you");
+            throw new AccessDeniedException("只能删除自己创建的角色");
         }
         // 判断该角色下面是否有用户
         Set<String> userIds = baseMapper.checkRoleUserMappingByRoleIds(ids);

+package org.thingsboard.server.dao.yunteng.impl;
+
+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.audit.ActionType;
+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.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;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtSysLogServiceImpl extends AbstractBaseService<YtSysLogMapper, SysLogEntity>
+        implements YtSysLogService {
+
+
+    @Override
+    public SysLogDTO detail(String entityId) {
+        return baseMapper.detailById(entityId);
+    }
+
+    @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);
+        return getPageData(page, SysLogDTO.class);
+    }
+
+
+    @Override
+    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, 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);
+        return getPageData(page, SysLogDTO.class);
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.yunteng.dto.SysLogDTO;
+import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@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("entityFilter") EntityType entityFilter, @Param("actionType") ActionType actionType, @Param("entityType") List<EntityType> entityType);
+
+
+    SysLogDTO detailById(@Param("entityId") String entityId);
+}

+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.yunteng.dto.SysLogDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
+
+public interface YtSysLogService extends BaseService<SysLogEntity> {
+
+
+    /**
+     * 日志详细信息
+     *
+     * @param entityId 日志ID
+     * @return
+     */
+    SysLogDTO detail(String entityId);
+
+    /**
+     * 异常日志列表
+     *
+     * @param pageInfrom 分页配置信息
+     * @param startTime  时间过滤窗口起点
+     * @param endTime    时间过滤窗口终点
+     * @param tenantId   租户ID，超级管理员该值为null
+     * @param customerId 客户ID，租户管理员该值为null
+     * @param actionType 日志类型
+     * @return
+     */
+    YtPageData<SysLogDTO> exceptionPage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType);
+
+    /**
+     * 操作日志列表
+     *
+     * @param pageInfrom 分页配置信息
+     * @param startTime  时间过滤窗口起点
+     * @param endTime    时间过滤窗口终点
+     * @param tenantId   租户ID，超级管理员该值为null
+     * @param customerId 客户ID，租户管理员该值为null
+     * @param actionType 日志类型
+     * @return
+     */
+    YtPageData<SysLogDTO> operatePage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, EntityType entityType, ActionType actionType);
+
+    /**
+     * 登录日志列表
+     *
+     * @param pageInfrom 分页配置信息
+     * @param startTime  时间过滤窗口起点
+     * @param endTime    时间过滤窗口终点
+     * @param tenantId   租户ID，超级管理员该值为null
+     * @param customerId 客户ID，租户管理员该值为null
+     * @param actionType 日志类型
+     * @return
+     */
+    YtPageData<SysLogDTO> loginPage(IPage<SysLogEntity> pageInfrom, Long startTime, Long endTime, String tenantId, String customerId, ActionType actionType);
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.YtSysLogMapper">
+    <resultMap id="logDto" type="org.thingsboard.server.common.data.yunteng.dto.SysLogDTO">
+        <result property="id" column="id"/>
+        <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+
+        <result property="entityId" column="entity_id"  typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="entityName" column="entity_name" />
+        <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="tenantName" column="tenant_name"/>
+        <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="customerName" column="customer_name"/>
+        <result property="userId" column="user_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
+        <result property="userName" column="user_name" />
+
+        <result property="actionData" column="action_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="actionType" column="action_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="actionStatus" column="action_status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="actionFailureDetails" column="action_failure_details"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <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,cus.title customer_name
+    </sql>
+    <sql id="detailColumn">
+        <include refid="baseColumn"></include>
+        , base.action_data,base.action_failure_details
+    </sql>
+
+    <select id="getPageDatasMatched" resultMap="logDto">
+        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 !=''">
+                AND base.tenant_id = #{tenantId}::uuid
+            </if>
+            <if test="customerId !=null ">
+                AND base.customer_id = #{customerId}::uuid
+            </if>
+            <if test="startTime !=null">
+                AND base.created_time >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                AND base.created_time &lt;  #{endTime}
+            </if>
+            <if test="actionType !=null">
+                AND base.action_type =  #{actionType}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPageDatasNot" resultMap="logDto">
+        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>
+            <if test="customerId !=null ">
+                AND base.customer_id = #{customerId}::uuid
+            </if>
+            <if test="startTime !=null">
+                AND base.created_time >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                AND base.created_time &lt;  #{endTime}
+            </if>
+            <if test="actionType !=null">
+                AND base.action_type =  #{actionType}
+            </if>
+        </where>
+    </select>
+
+    <select id="detailById" resultMap="logDto">
+        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
+
+        </where>
+    </select>
+
+</mapper>