refactor: 业务接口返回TCP解析脚本数据

芯火源
1 parent 112adacf
Showing 5 changed files with 52 additions and 24 deletions
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
common/cluster-api/src/main/proto/queue.proto
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @c7a79f7
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @c7a79f7
@@ -61,6 +61,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -76,6 +77,7 @@ import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
@@ -103,6 +105,8 @@ import org.thingsboard.server.service.install.DefaultSystemDataLoaderService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.resource.TbResourceService;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -130,6 +134,7 @@ public class DefaultTransportApiService implements TransportApiService {
     private final TbApiUsageStateService apiUsageStateService;
     private final DeviceService deviceService;
     private final TkDeviceService ytDeviceService;
+    private final TkDeviceScriptService scriptService;
     private final RelationService relationService;
     private final DeviceCredentialsService deviceCredentialsService;
     private final DbCallbackExecutorService dbCallbackExecutorService;
@@ -676,12 +681,28 @@ public class DefaultTransportApiService implements TransportApiService {
     private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.ScriptProto requestMsg) {
         int type = requestMsg.getFunctionType();
-        DeviceId deviceId = new DeviceId(new UUID(requestMsg.getScriptIdMSB(), requestMsg.getScriptIdLSB()));
-        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(TenantId.SYS_TENANT_ID, deviceId);
-
-        return Futures.immediateFuture(TransportApiResponseMsg.newBuilder()
-                .setDeviceCredentialsResponseMsg(TransportProtos.GetDeviceCredentialsResponseMsg.newBuilder()
-                        .setDeviceCredentialsData(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceCredentials))))
-                .build());
+        UUID scriptId = getUUID(requestMsg.getScriptIdLSB(),requestMsg.getScriptIdMSB());
+
+        List<TkDeviceScriptDTO> allScriptes = scriptService.getScriptes(Arrays.stream(TkScriptFunctionType.values()).filter(f->f.ordinal()==type).findFirst().get(),null,null,scriptId);
+        TransportApiResponseMsg.Builder responseBuilder = TransportApiResponseMsg.newBuilder();
+        allScriptes.forEach(item->{
+            UUID tenantId = UUID.fromString(item.getTenantId());
+            UUID id = UUID.fromString(item.getId());
+            responseBuilder.addScriptsResponseMsg(TransportProtos.ScriptProto.newBuilder()
+                    .setConvertJs(item.getConvertJs())
+                    .setTenantIdLSB(tenantId.getLeastSignificantBits())
+                    .setTenantIdMSB(tenantId.getMostSignificantBits())
+                    .setScriptIdLSB(id.getLeastSignificantBits())
+                    .setScriptIdMSB(id.getMostSignificantBits())
+                    .setFunctionType(item.getScriptType().ordinal())
+            );
+        });
+        return Futures.immediateFuture(responseBuilder.build());
+    }
+    private UUID getUUID(long lsb,long msb){
+        if(lsb==0 && msb==0){
+            return null;
+        }
+        return new UUID(msb,lsb);
     }
 }
--- a/common/cluster-api/src/main/proto/queue.proto
View file @c7a79f7
+++ b/common/cluster-api/src/main/proto/queue.proto
View file @c7a79f7
@@ -698,7 +698,7 @@ message TransportApiResponseMsg {
   GetDeviceCredentialsResponseMsg deviceCredentialsResponseMsg = 10;
   //Thingskit function
-  repeated ScriptProto scripts = 11;
+  repeated ScriptProto scriptsResponseMsg = 11;
 }
 /* Messages that are handled by ThingsBoard Core Service */
@@ -783,12 +783,12 @@ message ToOtaPackageStateServiceMsg {
-//Thingskit function
+//Thingskit function  请求：functionType、；响应：tenantId、projectId、scriptId、convertJs
 message ScriptProto{
   int64 tenantIdMSB = 1;
   int64 tenantIdLSB = 2;
-  int64 projectIdMSB = 3;
-  int64 projectIdLSB = 4;
+//  int64 projectIdMSB = 3;
+//  int64 projectIdLSB = 4;
   int64 scriptIdMSB = 5;
   int64 scriptIdLSB = 6;
   int32 functionType = 7;
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @c7a79f7
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @c7a79f7
@@ -1260,7 +1260,7 @@ public class DefaultTransportService implements TransportService {
                 new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setScript(msg).build());
         try {
             TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
-            return response.getValue().getScriptsList();
+            return response.getValue().getScriptsResponseMsgList();
         } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e);
         }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @c7a79f7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @c7a79f7
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkCustomerDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
@@ -100,14 +101,22 @@ public class TkDeviceScriptServiceImpl
   }
   @Override
-  public String getScriptText(String tenantId, String scriptId) {
+  public List<TkDeviceScriptDTO> getScriptes(TkScriptFunctionType type, UUID tenantId, UUID projectId, UUID scriptId){
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-        new QueryWrapper<TkDeviceScriptEntity>()
-            .lambda()
-            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-            .eq(TkDeviceScriptEntity::getId, scriptId);
-    TkDeviceScriptEntity result = baseMapper.selectOne(queryWrapper);
-    return (result == null || result.getStatus() == 0) ? null : result.getConvertJs();
+        new QueryWrapper<TkDeviceScriptEntity>().lambda();
+    if(type != null){
+      queryWrapper.eq(TkDeviceScriptEntity::getScriptType, type);
+    }
+    if(tenantId != null){
+      queryWrapper.eq(TkDeviceScriptEntity::getTenantId, tenantId.toString());
+    }
+    if(scriptId != null){
+      queryWrapper.eq(TkDeviceScriptEntity::getId, scriptId.toString());
+    }
+    List<TkDeviceScriptEntity> result = baseMapper.selectList(queryWrapper);
+    return result.stream()
+            .map(item -> item.getDTO(TkDeviceScriptDTO.class))
+            .collect(Collectors.toList());
   }
   @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
View file @c7a79f7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
View file @c7a79f7
 package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>{
@@ -17,7 +15,7 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
      * @param scriptId
      * @return
      */
-    String getScriptText(String tenantId, String scriptId);
+    List<TkDeviceScriptDTO> getScriptes(TkScriptFunctionType type, UUID tenantId, UUID projectId, UUID scriptId);
     TkDeviceScriptDTO insertOrUpdate(TkDeviceScriptDTO deviceDTO);