Merge branch 'cherry-pick-c740ed66' into 'master_dev'

fix:删除设备上下线历史记录的数据同步

See merge request yunteng/thingskit!464

@@ -90,7 +90,6 @@ import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.T
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryRepository;
-import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_event_kv.TkEventKvRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_java_script.TkJavaScriptRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_message_config.MessageConfigRepository;
@@ -309,8 +308,6 @@ public class EdgeContextComponent {
     @Autowired
     private final TkDeviceProfileCategoryRepository tkDeviceProfileCategoryRepository;
     @Autowired
-    private final TkDeviceStateLogRepository tkDeviceStateLogRepository;
-    @Autowired
     private final TkEventKvRepository tkEventKvRepository;
     @Autowired
     private final TkJavaScriptRepository tkJavaScriptRepository;

@@ -49,7 +49,6 @@ import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_center.T
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content.TkConfigurationContentEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_configuration_content_node.TkConfigurationContentNodeEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryEdgeEventFetcher;
-import org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log.TkDeviceStateLogEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_java_script.TkJavaScriptEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_message_config.MessageConfigEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.yunteng.tk_message_template.TkMessageTemplateEdgeEventFetcher;
@@ -83,7 +82,6 @@ public class EdgeSyncCursor {
             }
             //如果点击同步才会触发
             //thingsKit
-            fetchers.add(new TkDeviceStateLogEdgeEventFetcher(ctx.getTkDeviceStateLogRepository()));
             fetchers.add(new SysDictEdgeEventFetcher(ctx.getSysDictRepository()));//数据字典
             fetchers.add(new TkThingsModelEdgeEventFetcher(ctx.getTkThingsModelRepository()));//物模型
             fetchers.add(new TkDeviceProfileCategoryEdgeEventFetcher(ctx.getTkDeviceProfileCategoryRepository()));//产品品类

-/**
- * Copyright © 2016-2024 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.service.edge.rpc.yunteng.tk_device_state_log;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.data.EdgeUtils;
-import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.edge.EdgeEvent;
-import org.thingsboard.server.common.data.edge.EdgeEventActionType;
-import org.thingsboard.server.common.data.edge.EdgeEventType;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.yunteng.sync.TkDeviceStateLog;
-import org.thingsboard.server.service.edge.rpc.fetch.BasePageableEdgeEventFetcher;
-
-@AllArgsConstructor
-@Slf4j
-public class TkDeviceStateLogEdgeEventFetcher extends BasePageableEdgeEventFetcher<TkDeviceStateLog> {
-
-    private final TkDeviceStateLogRepository tkDeviceStateLogRepository ;
-
-    @Override
-    protected PageData<TkDeviceStateLog> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
-        // returns PageData object to be in sync with other fetchers
-        return tkDeviceStateLogRepository.selectToEdge(tenantId,edge.getId(),pageLink);
-    }
-
-    @Override
-    public EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, TkDeviceStateLog entity) {
-        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TK_DEVICE_STATE_LOG,
-                EdgeEventActionType.UPDATED, entity.getId(), null);
-    }
-}

-package org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.yunteng.sync.TkDeviceStateLog;
-import org.thingsboard.server.common.data.edge.EdgeEventType;
-import org.thingsboard.server.common.data.id.EdgeId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.yunteng.id.TkDeviceStateLogId;
-import org.thingsboard.server.common.data.yunteng.id.EntityIdProvider;
-import org.thingsboard.server.gen.edge.v1.TkUpdateMsg;
-import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessor;
-import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
-
-import java.util.UUID;
-
-@Slf4j
-@Component
-@AllArgsConstructor
-@TbCoreComponent
-public class TkDeviceStateLogEdgeProcessor extends TkEdgeProcessor<TkDeviceStateLogId, TkDeviceStateLog> {
-
-    TkDeviceStateLogRepository tkDeviceStateLogRepository;
-
-    @Override
-    public EntityType getEntityType() {
-        return EntityType.TK_DEVICE_STATE_LOG;
-    }
-
-    @Override
-    public EdgeEventType getEdgeEventType() {
-        return EdgeEventType.TK_DEVICE_STATE_LOG;
-    }
-
-    @Override
-    public TkEdgeProcessorRepository<TkDeviceStateLog> getEdgeProcessorRepository() {
-        return tkDeviceStateLogRepository;
-    }
-
-    @Override
-    public EntityIdProvider<TkDeviceStateLogId> getEntityIdProvider() {
-        return new EntityIdProvider<TkDeviceStateLogId>() {
-            @Override
-            public TkDeviceStateLogId fromString(String uuid) {
-                return TkDeviceStateLogId.fromString(uuid);
-            }
-
-            @Override
-            public TkDeviceStateLogId fromUUID(UUID uuid) {
-                return new TkDeviceStateLogId(uuid);
-            }
-        };
-    }
-
-    @Override
-    public TkDeviceStateLog constructEntityFromUpdateMsg(TenantId tenantId, EdgeId edgeId, TkUpdateMsg tkUpdateMsg) {
-        return JacksonUtil.fromString(tkUpdateMsg.getEntity(), TkDeviceStateLog.class, true);
-    }
-}

-package org.thingsboard.server.service.edge.rpc.yunteng.tk_device_state_log;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Repository;
-import org.thingsboard.server.common.data.yunteng.id.TkDeviceStateLogId;
-import org.thingsboard.server.common.data.yunteng.sync.TkDeviceStateLog;
-import org.thingsboard.server.common.data.id.*;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.yunteng.utils.CopyUtils;
-import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
-import org.thingsboard.server.dao.yunteng.mapper.TkDeviceStateLogMapper;
-import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-@Repository
-@AllArgsConstructor
-@Slf4j
-public class TkDeviceStateLogRepository implements TkEdgeProcessorRepository<TkDeviceStateLog> {
-    private TkDeviceStateLogMapper tkDeviceStateLogMapper;
-    @Override
-    public boolean updateFromEdge(TenantId tenantId, EdgeId edgeId, TkDeviceStateLog dto) throws Exception {
-        log.info("updateFromEdge {} , {} , {} , {}",tenantId,edgeId,dto.getId().getEntityType(),dto);
-
-        TkDeviceStateLogEntity model = tkDeviceStateLogMapper.selectById(dto.getId().getId().toString());
-        if (model == null) {
-            model = new TkDeviceStateLogEntity();
-            CopyUtils.copyProperties(dto, model);
-            model.setId(dto.getId().toString());
-            model.setTenantId(dto.getTenantId().getId().toString());
-            return tkDeviceStateLogMapper.insert(model)>0;
-        } else {
-            CopyUtils.copyProperties(dto, model);
-            model.setId(dto.getId().toString());
-            model.setTenantId(dto.getTenantId().getId().toString());
-            return tkDeviceStateLogMapper.updateById(model)>0;
-        }
-    }
-
-    @Override
-    public boolean deleteFromEdge(TenantId tenantId, EdgeId edgeId, EntityId entityId) throws Exception {
-        log.info("deleteFromEdge {} , {} , {}",tenantId,edgeId,entityId);
-
-        LambdaQueryWrapper<TkDeviceStateLogEntity> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TkDeviceStateLogEntity::getTenantId, tenantId.getId().toString());
-        queryWrapper.eq(TkDeviceStateLogEntity::getId, entityId.getId().toString());
-        return tkDeviceStateLogMapper.delete(queryWrapper)>0;
-    }
-
-    @Override
-    public PageData<TkDeviceStateLog> selectToEdge(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
-        log.info("selectToEdge {} , {} , {}/{}",tenantId,edgeId,pageLink.getPage(),pageLink.getPageSize());
-
-        LambdaQueryWrapper<TkDeviceStateLogEntity> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TkDeviceStateLogEntity::getTenantId, tenantId.getId().toString());
-        Page<TkDeviceStateLogEntity> queryPage = new Page<>(pageLink.getPage(), pageLink.getPageSize());
-        IPage<TkDeviceStateLogEntity> resultPage = tkDeviceStateLogMapper.selectPage(queryPage, queryWrapper);
-        return new PageData((List) resultPage.getRecords().stream().map(e->{
-            return toData(e);
-        }).collect(Collectors.toList()), (int) resultPage.getPages(), resultPage.getTotal(), resultPage.getCurrent()<resultPage.getPages());
-    }
-
-    @Override
-    public List<TkDeviceStateLog> selectToEdge(TenantId tenantId, EdgeId edgeId, EntityId entityId) {
-        log.info("selectToEdge {} , {} , {}",tenantId,edgeId,entityId);
-
-        LambdaQueryWrapper<TkDeviceStateLogEntity> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TkDeviceStateLogEntity::getTenantId, tenantId.getId().toString());
-        queryWrapper.eq(TkDeviceStateLogEntity::getId, entityId.getId().toString());
-        List<TkDeviceStateLogEntity> model= tkDeviceStateLogMapper.selectList(queryWrapper);
-        if(model!=null){
-            return model.stream().map(e->{return toData(e);}).collect(Collectors.toList());
-        }
-        else {
-            return null;
-        }
-    }
-
-
-    private TkDeviceStateLog toData(TkDeviceStateLogEntity e) {
-        TkDeviceStateLog data=new TkDeviceStateLog();
-        CopyUtils.copyProperties(e,data);
-        data.setId(TkDeviceStateLogId.fromString(e.getId()));
-        data.setTenantId(TenantId.fromUUID(UUID.fromString(e.getTenantId())));
-        return data;
-    }
-}