Merge branch '20221201' into 'master'

20221201 See merge request huang/thingsboard3.3.2!145

Merge branch '20221201' into 'master'
20221201 See merge request huang/thingsboard3.3.2!145
xp.Huang
2 parents d542bbe5 62e29baa
Showing 7 changed files with 38 additions and 19 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
common/transport/transport-api/src/main/java/org/thingsboard/server/common/yunteng/script/YtScriptFactory.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.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/controller/yunteng/TkDeviceScriptController.java
View file @bd4b3f4
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @bd4b3f4
@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
+import org.thingsboard.server.common.yunteng.script.YtScriptFactory;
 import org.thingsboard.server.common.yunteng.script.YtScriptInvokeService;
 import org.thingsboard.server.common.yunteng.script.YtScriptType;
 import org.thingsboard.server.controller.BaseController;
@@ -73,16 +74,7 @@ public class TkDeviceScriptController extends BaseController {
     String tenantId = getCurrentUser().getCurrentTenantId();
     scriptDTO.setTenantId(tenantId);
     scriptService.validateFormdata(scriptDTO, created);
-    /** 业务流程 1/3.编辑时同步刷新相关的设备配置 2/3.处理TB业务逻辑 3/3.处理业务平台的业务逻辑 */
-    if (!created) {
-      List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id);
-      for (DeviceProfileDTO profile : usedProfiles) {
-        DeviceProfile tbDeviceProfile =
-            buildTbDeviceProfileFromDeviceProfileDTO(
-                profile, scriptDTO.getTenantId(), scriptDTO.getConvertJs());
-        updateTbDeviceProfile(tbDeviceProfile);
-      }
-    }
+
     String creator = getCurrentUser().getCurrentUserId();
     scriptDTO.setCreator(creator);
@@ -96,9 +88,30 @@ public class TkDeviceScriptController extends BaseController {
   public ResponseEntity<Boolean> updateScriptStatus(
       @PathVariable("id") String id, @PathVariable("status") Integer status)
       throws ThingsboardException {
+    /** 业务流程 1/3.编辑时同步刷新相关的设备配置 2/3.处理TB业务逻辑 3/3.处理业务平台的业务逻辑 */
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    TkDeviceScriptDTO scriptDTO = scriptService.getDeviceScript(tenantId,id).get();
+    if(scriptDTO ==null || scriptDTO.getStatus().equals(status)){
+      return ResponseEntity.ok(false);
+    }
+    String convertJs = YtScriptFactory.INCLUD_ORIGINAL_DATA;
-    return ResponseEntity.ok(
-        scriptService.updateScriptStatus(getCurrentUser().getCurrentTenantId(), id, status));
+    if(1 == status){
+      if(scriptDTO.isSaveOriginalData()){
+        convertJs += scriptDTO.getConvertJs();
+      }else{
+        convertJs = scriptDTO.getConvertJs();
+      }
+    }
+    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id);
+    for (DeviceProfileDTO profile : usedProfiles) {
+      DeviceProfile tbDeviceProfile =
+              buildTbDeviceProfileFromDeviceProfileDTO(
+                      profile, tenantId, convertJs);
+      updateTbDeviceProfile(tbDeviceProfile);
+    }
+    scriptService.updateScriptStatus(tenantId, id, status);
+    return ResponseEntity.ok(true);
   }
   /**
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @bd4b3f4
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @bd4b3f4
@@ -98,6 +98,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
+import org.thingsboard.server.service.install.DefaultSystemDataLoaderService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.resource.TbResourceService;
@@ -303,7 +304,7 @@ public class DefaultTransportApiService implements TransportApiService {
                     device.setName(requestMsg.getDeviceName());
                     device.setType(requestMsg.getDeviceType());
                     device.setCustomerId(gateway.getCustomerId());
-                    DeviceProfile deviceProfile = deviceProfileCache.findOrCreateDeviceProfile(gateway.getTenantId(), requestMsg.getDeviceType());
+                    DeviceProfile deviceProfile = deviceProfileCache.findOrCreateDeviceProfile(gateway.getTenantId(), DefaultSystemDataLoaderService.DEFAULT_DEVICE_TYPE);
                     device.setDeviceProfileId(deviceProfile.getId());
                     ObjectNode additionalInfo = JacksonUtil.newObjectNode();
                     additionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
@@ -312,7 +313,7 @@ public class DefaultTransportApiService implements TransportApiService {
                     //Thingskit function
-                    ytDeviceService.saveSlaveDevice(savedDevice.getId().getId().toString(), savedDevice.getName(), gateway.getId().getId().toString(),gateway.getCreatedTime());
+                    ytDeviceService.saveSlaveDevice(savedDevice.getId().getId().toString(), savedDevice.getName(),deviceProfile.getId().getId().toString(), gateway.getId().getId().toString(),gateway.getCreatedTime());
                     tbClusterService.onDeviceUpdated(savedDevice, null);
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @bd4b3f4
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @bd4b3f4
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
+import org.thingsboard.server.common.yunteng.script.YtScriptFactory;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
@@ -122,7 +123,7 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
         this.toDeviceRpcResponseTopicFilter = tcpConfiguration.getRpcTopic();
         String scriptBody = tcpConfiguration.getScriptText();
         try {
-            this.scriptId = this.adaptor.getJsScriptEngineFunctionId(scriptBody);
+            this.scriptId = this.adaptor.getJsScriptEngineFunctionId(scriptBody==null? YtScriptFactory.INCLUD_ORIGINAL_DATA:scriptBody);
         } catch (ExecutionException e) {
             log.warn("设备配置【{}】的脚本【{}】解析异常",deviceProfile.getSearchText(),scriptBody);
             throw new RuntimeException(e);
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/yunteng/script/YtScriptFactory.java
View file @bd4b3f4
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/yunteng/script/YtScriptFactory.java
View file @bd4b3f4
@@ -21,6 +21,7 @@ public class YtScriptFactory {
     public static final String RULE_NODE_FUNCTION_NAME = "tcpTransportFunc";
+    public static final String INCLUD_ORIGINAL_DATA  = "out.source=params;";
     private static final String JS_WRAPPER_PREFIX_TEMPLATE = "function %s(params) { " +
             "    var out = new Object(); " +
             "    return JSON.stringify(%s(params));" +
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @bd4b3f4
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @bd4b3f4
@@ -83,7 +83,7 @@ public class TkDeviceScriptServiceImpl
   @Override
   @Transactional
   public boolean updateScriptStatus(String tenantId, String id, Integer status) {
-    if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(id) || null != status) {
+    if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(id) || null == status) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     TkDeviceScriptEntity entity = baseMapper.selectById(id);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @bd4b3f4
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @bd4b3f4
@@ -44,6 +44,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     implements TkDeviceService {
   private final DeviceProfileDao deviceProfileDao;
+  private final TkDeviceProfileMapper tkProfileMapper;
   private final OrganizationMapper tkOrganizationMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
@@ -491,7 +492,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   public boolean saveSlaveDevice(
-      String slaveId, String slaveName, String gatewayId, Long createTime) {
+      String slaveId, String slaveName, String tbProfileId, String gatewayId, Long createTime) {
     LambdaQueryWrapper<TkDeviceEntity> deviceFilter =
         new QueryWrapper<TkDeviceEntity>().lambda().eq(TkDeviceEntity::getTbDeviceId, gatewayId);
     TkDeviceEntity gateway = baseMapper.selectOne(deviceFilter);
@@ -505,7 +506,9 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         JacksonUtil.toJsonNode(
             "{\"avatar\": \"\",\"longitude\": \"\",\"latitude\": \"\",\"address\": \"\"}"));
-    slaveDevice.setProfileId(gateway.getProfileId());
+    DeviceProfileDTO profileDTO = tkProfileMapper.selectDetail(gateway.getTenantId(),tbProfileId);
+    slaveDevice.setProfileId(profileDTO.getTbProfileId());
+    slaveDevice.setDeviceProfileId(profileDTO.getId());
     slaveDevice.setGatewayId(gateway.getId());
     slaveDevice.setOrganizationId(gateway.getOrganizationId());
     slaveDevice.setTenantId(gateway.getTenantId());
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @bd4b3f4
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @bd4b3f4
@@ -156,7 +156,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param gatewayId 网关设备TB平台的ID
    * @return
    */
-  boolean saveSlaveDevice(String slaveId, String slaveName, String gatewayId, Long createTime);
+  boolean saveSlaveDevice(String slaveId, String slaveName, String tbProfileId,String gatewayId, Long createTime);
   /**
    * 通过设备ids查询设备信息列表