feat: 【ThingsKit】add device state logs

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceStateLogDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
+
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/device/state/log")
+@Api(tags = {"设备上下线记录"})
+public class TkDeviceStateLogController extends BaseController {
+  private final TkDeviceStateLogService tkDeviceStateLogService;
+
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:device:state:log:view'})")
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("查询")
+  public TkPageData<TkDeviceStateLogDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "deviceName", required = false) String deviceName,
+      @RequestParam(value = "organizationName", required = false) String organizationName,
+      @RequestParam(value = "deviceProfileName", required = false) String deviceProfileName,
+      @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    Map<String, Object> queryMap = new HashMap<>();
+    queryMap.put("deviceName", deviceName);
+    queryMap.put("organizationName", organizationName);
+    queryMap.put("deviceProfileName", deviceProfileName);
+    queryMap.put("status", status);
+    if (null != startTime && null != endTime) {
+      if (startTime > endTime) {
+        throw new TkDataValidationException(
+            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+      }
+      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+    }
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put(ORDER_TYPE, orderType);
+    queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
+    return tkDeviceStateLogService.page(getCurrentUser().getCurrentTenantId(), queryMap);
+  }
+
+  @DeleteMapping
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:device:state:log::delete'})")
+  public ResponseEntity<Boolean> deleteDeviceStateLog(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(tkDeviceStateLogService.deleteTkDeviceStateLog(deleteDTO));
+  }
+
+  @PostMapping
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:device:state:log::post'})")
+  public ResponseEntity<TkDeviceStateLogDTO> updateDeviceStateLogInfo(
+      @RequestBody TkDeviceStateLogDTO tkDeviceStateLogDTO) throws ThingsboardException {
+    if(StringUtils.isEmpty(tkDeviceStateLogDTO.getId())){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    tkDeviceStateLogDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(
+        tkDeviceStateLogService.saveOrUpdateTkDeviceStateLogInfo(tkDeviceStateLogDTO));
+  }
+
+  @GetMapping("{id}")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:device:state:log::detail'})")
+  public ResponseEntity<TkDeviceStateLogDTO> getDeviceStateLogInfo(@PathVariable("id") String id)
+      throws ThingsboardException {
+    return ResponseEntity.ok(
+        tkDeviceStateLogService.findTkDeviceStateLogInfoById(
+            getCurrentUser().getCurrentTenantId(), id));
+  }
+}

@@ -39,6 +39,9 @@ import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceStateLogDTO;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
@@ -49,6 +52,8 @@ import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.service.partition.AbstractPartitionBasedService;
@@ -58,6 +63,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -87,6 +93,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     private final TimeseriesService tsService;
     private final TbClusterService clusterService;
     private final PartitionService partitionService;
+    private final TkDeviceService tkDeviceService;
+    private final TkDeviceStateLogService tkDeviceStateLogService;
 
     private TelemetrySubscriptionService tsSubService;
 
@@ -112,13 +120,16 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
 
     public DefaultDeviceStateService(TenantService tenantService, DeviceService deviceService,
                                      AttributesService attributesService, TimeseriesService tsService,
-                                     TbClusterService clusterService, PartitionService partitionService) {
+                                     TbClusterService clusterService, PartitionService partitionService,
+                                     TkDeviceService tkDeviceService,TkDeviceStateLogService tkDeviceStateLogService) {
         this.tenantService = tenantService;
         this.deviceService = deviceService;
         this.attributesService = attributesService;
         this.tsService = tsService;
         this.clusterService = clusterService;
         this.partitionService = partitionService;
+        this.tkDeviceService = tkDeviceService;
+        this.tkDeviceStateLogService = tkDeviceStateLogService;
     }
 
     @Autowired
@@ -165,6 +176,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         save(deviceId, LAST_CONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, CONNECT_EVENT);
         checkAndUpdateState(deviceId, stateData);
+        //ThingsKit
+        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.ONLINE);
 
     }
 
@@ -207,6 +220,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         stateData.getState().setLastDisconnectTime(ts);
         save(deviceId, LAST_DISCONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, DISCONNECT_EVENT);
+        //ThingsKit
+        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.OFFLINE);
     }
 
     @Override
@@ -343,7 +358,26 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             }
         }
     }
-
+    //ThingsKit
+    private void saveDeviceStateLog(String tenantId,String tbDeviceId,Integer status){
+        try{
+            DeviceDTO deviceDTO = tkDeviceService.findDeviceInfoByTbDeviceId(tenantId,tbDeviceId);
+            if(null != deviceDTO){
+                TkDeviceStateLogDTO tkDeviceStateLogDTO = new TkDeviceStateLogDTO();
+                tkDeviceStateLogDTO.setTenantId(tenantId);
+                tkDeviceStateLogDTO.setTbDeviceId(tbDeviceId);
+                tkDeviceStateLogDTO.setStatus(status);
+                tkDeviceStateLogDTO.setDeviceName(deviceDTO.getName());
+                tkDeviceStateLogDTO.setDeviceType(deviceDTO.getDeviceType());
+                tkDeviceStateLogDTO.setDeviceProfileName(deviceDTO.getDeviceProfile().getName());
+                tkDeviceStateLogDTO.setOrganizationName(deviceDTO.getOrganizationDTO().getName());
+                tkDeviceStateLogDTO.setCreateTime(LocalDateTime.now());
+                tkDeviceStateLogService.saveOrUpdateTkDeviceStateLogInfo(tkDeviceStateLogDTO);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
     private void addDeviceUsingState(TopicPartitionInfo tpi, DeviceStateData state) {
         Set<DeviceId> deviceIds = partitionedEntities.get(tpi);
         if (deviceIds != null) {

@@ -26,6 +26,8 @@ import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.cluster.TbClusterService;
 
@@ -53,6 +55,10 @@ public class DefaultDeviceStateServiceTest {
     PartitionService partitionService;
     @Mock
     DeviceStateData deviceStateDataMock;
+    @Mock
+    TkDeviceService tkDeviceService;
+    @Mock
+    TkDeviceStateLogService tkDeviceStateLogService;
 
     DeviceId deviceId = DeviceId.fromString("00797a3b-7aeb-4b5b-b57a-c2a810d0f112");
 
@@ -60,7 +66,7 @@ public class DefaultDeviceStateServiceTest {
 
     @Before
     public void setUp() {
-        service = spy(new DefaultDeviceStateService(tenantService, deviceService, attributesService, tsService, clusterService, partitionService));
+        service = spy(new DefaultDeviceStateService(tenantService, deviceService, attributesService, tsService, clusterService, partitionService,tkDeviceService,tkDeviceStateLogService));
     }
 
     @Test

@@ -13,9 +13,54 @@ public interface FastIotConstants {
   String CHART_EXECUTE_ATTRIBUTES = "executeAttributes";
   String ASSERT_DEFAULT_NAME = "default";
   public static final String TCP_DEVICE_IDENTIFY_FILED = "deviceCode";
+  String MOBILE =
+      "^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$";
+  String EMAIL = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$";
+  Pattern EMAIL_PATTERN = Pattern.compile(EMAIL, Pattern.CASE_INSENSITIVE);
+  Pattern CHINA_MOBILE_PATTERN = Pattern.compile(MOBILE);
+  String DEFAULT_DELIMITER = "#";
+  interface CacheConfigKey {
+    String CACHE_CONFIG_KEY = "yunTengIotCache";
+    String USER_PERMISSION_PREFIX = "userPermissionFor_";
+    String MOBILE_LOGIN_SMS_CODE = "mobileLoginSmsCode";
+  }
+  interface TBCacheConfig {
+    String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
+    String EXISTING_TENANT = "EXISTING_TENANT";
+  }
+
+  interface ReadState {
+    String UNREAD = "0";
+    String READ = "1";
+  }
+
+  interface ReceiverType {
+    int PERSONAL = 3;
+    int DEPARTMENT = 2;
+    int ORGANIZATION = 1;
+    int ALL = 0;
+  }
+
+  interface DraftStatus {
+    int PUBLISHED = 1;
+    int DRAFT = 0;
+  }
+
+  interface CacheKey {
+    String area = "thingsArea";
+    int DRAFT = 0;
+  }
+
+  interface ConfigureLevel {
+    String CONFIGURE = "CONFIGURE";
+    String CONTENT = "CONTENT";
+    String NODE = "NODE";
+  }
+
   class DefaultOrder {
-    public static final String CREATE_TIME="create_time";
+    public static final String CREATE_TIME = "create_time";
   }
+
   class ScheduleConstants {
     public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
@@ -34,61 +79,47 @@ public interface FastIotConstants {
     /** 不触发立即执行 */
     public static final int MISFIRE_DO_NOTHING = 3;
 
-    /**
-     * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
-     */
-    public static final String[] JOB_WHITELIST_STR = { "org.thingsboard.server.dao.util.yunteng.task" };
-    /**
-     * http请求
-     */
+    /** 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */
+    public static final String[] JOB_WHITELIST_STR = {
+      "org.thingsboard.server.dao.util.yunteng.task"
+    };
+    /** http请求 */
     public static final String HTTP = "http://";
 
-    /**
-     * https请求
-     */
+    /** https请求 */
     public static final String HTTPS = "https://";
 
-
-    /**
-     * RMI 远程方法调用
-     */
+    /** RMI 远程方法调用 */
     public static final String LOOKUP_RMI = "rmi:";
 
-    /**
-     * LDAP 远程方法调用
-     */
+    /** LDAP 远程方法调用 */
     public static final String LOOKUP_LDAP = "ldap:";
 
-    /**
-     * LDAPS 远程方法调用
-     */
+    /** LDAPS 远程方法调用 */
     public static final String LOOKUP_LDAPS = "ldaps:";
-    /**
-     * 定时任务违规的字符
-     */
-    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache"};
-
+    /** 定时任务违规的字符 */
+    public static final String[] JOB_ERROR_STR = {
+      "java.net.URL",
+      "javax.naming.InitialContext",
+      "org.yaml.snakeyaml",
+      "org.springframework",
+      "org.apache"
+    };
   }
-  class MagicNumber{
+
+  class MagicNumber {
     public static final int ZERO = 0;
     public static final int ONE = 1;
     public static final int TEN = 10;
   }
 
-  String MOBILE =
-      "^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$";
-  String EMAIL = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$";
-  Pattern EMAIL_PATTERN = Pattern.compile(EMAIL, Pattern.CASE_INSENSITIVE);
-  Pattern CHINA_MOBILE_PATTERN = Pattern.compile(MOBILE);
-
   class ConfigJSONKey {
     public static final String BASE_URL = "baseUrl";
   }
+
   class Relation {
     public static final String relationType = "Created";
   }
-  String DEFAULT_DELIMITER = "#";
 
   class StateValue {
     /** 禁用 */
@@ -96,6 +127,11 @@ public interface FastIotConstants {
     /** 启用 */
     public static final int ENABLE = 1;
 
+    /** 离线 */
+    public static final int OFFLINE = 0;
+    /** 在线 */
+    public static final int ONLINE = 1;
+
     /** 删除成功 */
     public static final String DELETE_SUCCESS = "删除成功";
 
@@ -105,7 +141,7 @@ public interface FastIotConstants {
 
   class LevelValue {
     /** 超级管理员 */
-    public static final int IS_ADMIN=0;
+    public static final int IS_ADMIN = 0;
 
     /** 系统平台其他管理员 */
     public static final int IS_PLATFORM_ADMIN = 1;
@@ -116,42 +152,4 @@ public interface FastIotConstants {
     /** 租户下的用户 */
     public static final int IS_CUSTOMER_USER = 3;
   }
-
-  interface CacheConfigKey {
-    String CACHE_CONFIG_KEY = "yunTengIotCache";
-    String USER_PERMISSION_PREFIX = "userPermissionFor_";
-    String MOBILE_LOGIN_SMS_CODE = "mobileLoginSmsCode";
-  }
-
-  interface TBCacheConfig {
-    String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
-    String EXISTING_TENANT = "EXISTING_TENANT";
-  }
-  interface ReadState {
-    String UNREAD = "0";
-    String READ = "1";
-  }
-
-  interface ReceiverType {
-    int PERSONAL = 3;
-    int DEPARTMENT = 2;
-    int ORGANIZATION = 1;
-    int ALL = 0;
-  }
-
-  interface DraftStatus {
-    int PUBLISHED = 1;
-    int DRAFT = 0;
-  }
-
-  interface CacheKey {
-    String area = "thingsArea";
-    int DRAFT = 0;
-  }
-
-  interface ConfigureLevel {
-    String CONFIGURE = "CONFIGURE";
-    String CONTENT = "CONTENT";
-    String NODE = "NODE";
-  }
 }

@@ -110,6 +110,8 @@ public final class ModelConstants {
     public static final String TK_THING_MODEL = "tk_things_model";
     /** 客户和设备的映射表 */
     public static final String TK_CUSTOMER_DEVICE_NAME = "tk_customer_device";
+    /** 设备上下线记录表 */
+    public static final String TK_DEVICE_STATE_LOG = "tk_device_state_log";
   }
 
   public static class TableFields {

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+@Data
+public class TkDeviceStateLogDTO extends TenantDTO {
+  @ApiModelProperty(value = "设备ID")
+  private String tbDeviceId;
+
+  @ApiModelProperty(value = "设备状态：0离线 1在线")
+  private Integer status;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "设备名称")
+  private String deviceName;
+
+  @ApiModelProperty(value = "设备配置名称")
+  private String deviceProfileName;
+
+  @ApiModelProperty(value = "设备类型")
+  private DeviceTypeEnum deviceType;
+
+  @ApiModelProperty(value = "组织名称")
+  private String organizationName;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+@Data
+@TableName(value = ModelConstants.Table.TK_DEVICE_STATE_LOG, autoResultMap = true)
+@EqualsAndHashCode(callSuper = true)
+public class TkDeviceStateLogEntity extends TenantBaseEntity {
+  private String tbDeviceId;
+  /** 告警状态：0：正常 1：告警 */
+  private Integer status;
+
+  private String deviceName;
+  private String deviceProfileName;
+
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private DeviceTypeEnum deviceType;
+
+  private String organizationName;
+  private String remark;
+}

@@ -633,4 +633,12 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return baseMapper.getDeviceRelation(isSlave, deviceId);
   }
+
+  @Override
+  public DeviceDTO findDeviceInfoByTbDeviceId(String tenantId, String tbDeviceId) {
+    if(StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(tbDeviceId)){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return baseMapper.findDeviceInfo(tenantId, tbDeviceId);
+  }
 }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceStateLogDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkDeviceStateLogMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class TkDeviceStateLogServiceImpl
+    extends AbstractBaseService<TkDeviceStateLogMapper, TkDeviceStateLogEntity>
+    implements TkDeviceStateLogService {
+  @Override
+  public TkPageData<TkDeviceStateLogDTO> page(String tenantId, Map<String, Object> queryMap) {
+    String deviceName =
+        Optional.ofNullable(queryMap.get("deviceName")).map(Object::toString).orElse(null);
+    String organizationName =
+        Optional.ofNullable(queryMap.get("organizationName")).map(Object::toString).orElse(null);
+    String deviceProfileName =
+        Optional.ofNullable(queryMap.get("deviceProfileName")).map(Object::toString).orElse(null);
+    Integer status =
+        Optional.ofNullable(queryMap.get("status"))
+            .map(obj -> Integer.valueOf(obj.toString()))
+            .orElse(null);
+    LocalDateTime startTime =
+        (LocalDateTime) Optional.ofNullable(queryMap.get("startTime")).orElse(null);
+    LocalDateTime endTime =
+        (LocalDateTime) Optional.ofNullable(queryMap.get("endTime")).orElse(null);
+    IPage<TkDeviceStateLogEntity> currentPage =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    LambdaQueryWrapper<TkDeviceStateLogEntity> queryWrapper =
+        new LambdaQueryWrapper<TkDeviceStateLogEntity>()
+            .eq(TkDeviceStateLogEntity::getTenantId, tenantId)
+            .eq(null != status, TkDeviceStateLogEntity::getStatus, status)
+            .like(
+                StringUtils.isNotEmpty(deviceName),
+                TkDeviceStateLogEntity::getDeviceName,
+                deviceName)
+            .like(
+                StringUtils.isNotEmpty(organizationName),
+                TkDeviceStateLogEntity::getOrganizationName,
+                organizationName)
+            .like(
+                StringUtils.isNotEmpty(deviceProfileName),
+                TkDeviceStateLogEntity::getDeviceProfileName,
+                deviceProfileName)
+            .and(
+                null != startTime && null != endTime,
+                qr ->
+                    qr.ge(TkDeviceStateLogEntity::getCreateTime, startTime)
+                        .le(TkDeviceStateLogEntity::getCreateTime, endTime));
+    return getPageData(baseMapper.selectPage(currentPage, queryWrapper), TkDeviceStateLogDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteTkDeviceStateLog(DeleteDTO deleteDTO) {
+    return baseMapper.delete(
+            new LambdaQueryWrapper<TkDeviceStateLogEntity>()
+                .eq(TkDeviceStateLogEntity::getTenantId, deleteDTO.getTenantId())
+                .in(TkDeviceStateLogEntity::getId, deleteDTO.getIds()))
+        > FastIotConstants.MagicNumber.ZERO;
+  }
+
+  @Override
+  public TkDeviceStateLogDTO findTkDeviceStateLogInfoById(String tenantId, String id) {
+    TkDeviceStateLogEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDeviceStateLogEntity>().eq(TkDeviceStateLogEntity::getId, id));
+    if (null != entity && !Objects.equals(entity.getTenantId(), tenantId)) {
+      throw new TkDataValidationException(
+          ErrorMessage.INVALID_PARAMETER_OR_NOT_MATCH_TENANT.getMessage());
+    }
+    return null != entity ? entity.getDTO(TkDeviceStateLogDTO.class) : null;
+  }
+
+  @Override
+  @Transactional
+  public TkDeviceStateLogDTO saveOrUpdateTkDeviceStateLogInfo(
+      TkDeviceStateLogDTO tkDeviceStateLogDTO) {
+    TkDeviceStateLogEntity saveEntity = tkDeviceStateLogDTO.getEntity(TkDeviceStateLogEntity.class);
+    if (null == tkDeviceStateLogDTO.getId()) {
+      baseMapper.insert(saveEntity);
+    } else {
+      TkDeviceStateLogEntity entity =
+          baseMapper.selectOne(
+              new LambdaQueryWrapper<TkDeviceStateLogEntity>()
+                  .eq(TkDeviceStateLogEntity::getId, tkDeviceStateLogDTO.getId()));
+      if (null == entity
+          || !Objects.equals(tkDeviceStateLogDTO.getTenantId(), entity.getTenantId())) {
+        throw new TkDataValidationException(
+            ErrorMessage.INVALID_PARAMETER_OR_NOT_MATCH_TENANT.getMessage());
+      }
+      baseMapper.updateById(saveEntity);
+    }
+
+    return tkDeviceStateLogDTO;
+  }
+}

@@ -144,4 +144,6 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
       @Param("deviceIds") List<String> deviceIds);
 
   String getDeviceRelation(@Param("isSlave") boolean isSlave, @Param("deviceId") String deviceId);
+
+  DeviceDTO findDeviceInfo(@Param("tenantId") String tenantId,@Param("tbDeviceId") String tbDeviceId);
 }

+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.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
+
+import java.util.Map;
+
+@Mapper
+public interface TkDeviceStateLogMapper extends BaseMapper<TkDeviceStateLogEntity> {
+  IPage<DeviceProfileDTO> getPage(
+      IPage<?> page,
+      @Param("tenantId") String tenantId,
+      @Param("queryMap") Map<String, Object> queryMap);
+}

@@ -190,4 +190,6 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   JsonNode getDeviceAttributes(String deviceProfileId, String tenantId, DataTypeEnum dataType);
 
   String getDeviceRelation(boolean isSlave,String deviceId);
+
+  DeviceDTO findDeviceInfoByTbDeviceId(String tenantId,String tbDeviceId);
 }

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceStateLogDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
+
+import java.util.Map;
+
+public interface TkDeviceStateLogService extends BaseService<TkDeviceStateLogEntity> {
+  TkPageData<TkDeviceStateLogDTO> page(String tenantId,Map<String, Object> queryMap);
+
+  boolean deleteTkDeviceStateLog(DeleteDTO deleteDTO);
+
+  TkDeviceStateLogDTO findTkDeviceStateLogInfoById(String tenantId, String id);
+
+  TkDeviceStateLogDTO saveOrUpdateTkDeviceStateLogInfo(TkDeviceStateLogDTO tkDeviceStateLogDTO);
+}

@@ -448,4 +448,14 @@
           AND to_id :: TEXT = #{deviceId}
         </if>
     </select>
+
+    <select id="findDeviceInfo" resultMap="deviceMap">
+        SELECT
+        <include refid="basicColumns"/>,tdp.name AS profile_name,io.name AS organization_name
+        FROM tk_device ifd
+        LEFT JOIN tk_device_profile tdp ON ifd.device_profile_id = tdp.id
+        LEFT JOIN tk_organization io ON io.id = ifd.organization_id
+        WHERE ifd.tb_device_id = #{tbDeviceId}
+        AND ifd.tenant_id = #{tenantId}
+    </select>
 </mapper>