Merge remote-tracking branch 'origin/i18n' into i18n

chenjunyu_1481036421
2 parents a6d21805 4da01340
Showing 5 changed files with 19 additions and 39 deletions
application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvEdgeProcessor.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvRepository.java
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvEdgeProcessor.java
View file @aaf0707
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvEdgeProcessor.java
View file @aaf0707
@@ -18,6 +18,7 @@ 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 org.thingsboard.server.service.edge.rpc.yunteng.tk_device_profile_category.TkDeviceProfileCategoryRepository;
+import org.thingsboard.server.service.state.DeviceStateService;
 import java.util.UUID;
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvRepository.java
View file @aaf0707
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/yunteng/tk_event_kv/TkEventKvRepository.java
View file @aaf0707
@@ -3,6 +3,7 @@ package org.thingsboard.server.service.edge.rpc.yunteng.tk_event_kv;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Repository;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -16,6 +17,7 @@ import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvCompositeKe
 import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvEntity;
 import org.thingsboard.server.dao.yunteng.jpa.repository.event.EventKvRepository;
 import org.thingsboard.server.service.edge.rpc.yunteng.TkEdgeProcessorRepository;
+import org.thingsboard.server.service.state.DeviceStateService;
 import java.util.List;
 import java.util.Optional;
@@ -25,6 +27,7 @@ import java.util.Optional;
 public class TkEventKvRepository implements TkEdgeProcessorRepository<TkEventKv> {
     private EventKvRepository eventKvRepository;
+    private DeviceStateService deviceStateService;
     @Override
     public boolean updateFromEdge(TenantId tenantId, EdgeId edgeId, TkEventKv dto) throws Exception {
@@ -34,6 +37,7 @@ public class TkEventKvRepository implements TkEdgeProcessorRepository<TkEventKv>
         id.setEventType(dto.getEventType());
         id.setEntityId(dto.getId().getId());
         Optional<TkEventKvEntity> optional = eventKvRepository.findById(id);
+        deviceStateService.onDeviceActivity(tenantId,new DeviceId(dto.getId().getId()),System.currentTimeMillis());
         if(optional.isPresent()){
             TkEventKvEntity model=optional.get();
             CopyUtils.copyProperties(dto, model);
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @aaf0707
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @aaf0707
@@ -292,9 +292,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
 				//thingkit function
                 String tenantId = stateData.getTenantId().getId().toString();
                 String tbDeviceId = deviceId.getId().toString();
-                tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
-                        org.thingsboard.server.common.data.yunteng.enums.DeviceState.ONLINE);
-                //ThingsKit
                 saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.ONLINE);
             }
         } else {
@@ -515,7 +512,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         }
     }
-    private boolean addDeviceUsingState(TopicPartitionInfo tpi, DeviceStateData state) {
+    private boolean addDeviceUsingState(TopicPartitionInfo tpi, final DeviceStateData state) {
         Set<DeviceId> deviceIds = partitionedEntities.get(tpi);
         if (deviceIds != null) {
             deviceIds.add(state.getDeviceId());
@@ -547,7 +544,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                         if (e instanceof TenantNotFoundException) {
                             idsFromRemovedTenant.add(deviceId);
                         } else {
-                            log.warn("[{}] Failed to update inactivity state [{}]", deviceId, e.getMessage());
+                            log.error("[{}] Failed to update inactivity state [{}]", deviceId, e.getMessage());
                         }
                     }
                 }
@@ -592,17 +589,18 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             if (!isActive(ts, state)
                     && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() <= state.getLastActivityTime())
                     && stateData.getDeviceCreationTime() + state.getInactivityTimeout() <= ts) {
+
+                //thingskit code使设备下线，不必判断partition是不是isMyPartition，因为我也不知道if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition())是干嘛的
+                reportInactivity(ts, deviceId, stateData);
+                if(stateData.getState().getLastActivityTime()>0){
+                    String tenantId = stateData.getTenantId().getId().toString();
+                    String tbDeviceId = deviceId.getId().toString();
+                    saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
+                    channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
+                }
+
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
-                    reportInactivity(ts, deviceId, stateData);
-                    if(stateData.getState().getLastActivityTime()>0){
-                        String tenantId = stateData.getTenantId().getId().toString();
-                        String tbDeviceId = deviceId.getId().toString();
-                        tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
-                                org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
-                        saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
-                        //thingskit update tkDevice state
-                        channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
-                    }
+
                 } else {
                     cleanupEntity(deviceId);
                 }
@@ -619,6 +617,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         state.setLastInactivityAlarmTime(ts);
         save(deviceId, INACTIVITY_ALARM_TIME, ts);
         onDeviceActivityStatusChange(deviceId, false, stateData);
+        System.err.println("Inactivity Device : "+deviceId);
     }
     boolean isActive(long ts, DeviceState state) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @aaf0707
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @aaf0707
@@ -879,22 +879,6 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
                 .collect(Collectors.toList());
     }
-    @Override
-    public boolean updateDeviceStateByTbDeviceId(
-            String tenantId, String tbDeviceId, DeviceState deviceState) {
-        boolean result = false;
-        TkDeviceEntity entity =
-                baseMapper.selectOne(
-                        new LambdaQueryWrapper<TkDeviceEntity>()
-                                .eq(TkDeviceEntity::getTenantId, UUID.fromString(tenantId))
-                                .eq(TkDeviceEntity::getId, UUID.fromString(tbDeviceId)));
-
-        if (null != entity) {
-            entity.setDeviceState(deviceState);
-            return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
-        }
-        return result;
-    }
     @Override
     public DeviceDTO getDeviceByDeviceNameOrIdAndGateWayId(String tenantId, String nameOrTbDeviceId, String gateWayId) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @aaf0707
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @aaf0707
@@ -265,14 +265,6 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
    */
   List<DeviceDTO> findDeviceInfoByTbDeviceIds(List<String> tbDeviceIds,String tenantId);
-  /**
-   * 根据TB的设备ID更新TK的设备状态
-   * @param tenantId 租户ID
-   * @param tbDeviceId TB的设备ID
-   * @param deviceState 设备状态枚举值
-   * @return true成功 false失败
-   */
-  boolean updateDeviceStateByTbDeviceId(String tenantId, String tbDeviceId, DeviceState deviceState);
   /**
    * 根据租户ID和设备名称或设备ID查询该设备的信息