Merge branch '20221203' into 'master'

fix: 创建产品，解析脚本禁用时，默认输出原生数据

See merge request huang/thingsboard3.3.2!147

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
+import org.thingsboard.server.common.yunteng.script.YtScriptFactory;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
@@ -302,7 +303,7 @@ public class TkDeviceProfileController extends BaseController {
     }
     }
 
 
     tbDeviceProfile.setProfileData(
     tbDeviceProfile.setProfileData(
-        buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData(), scriptText));
+        buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData(), scriptText == null? YtScriptFactory.INCLUD_ORIGINAL_DATA:scriptText));
     return tbDeviceProfile;
     return tbDeviceProfile;
   }
   }
 }
 }

@@ -105,7 +105,7 @@ public class TkDeviceScriptServiceImpl
             .eq(TkDeviceScriptEntity::getTenantId, tenantId)
             .eq(TkDeviceScriptEntity::getTenantId, tenantId)
             .eq(TkDeviceScriptEntity::getId, scriptId);
             .eq(TkDeviceScriptEntity::getId, scriptId);
     TkDeviceScriptEntity result = baseMapper.selectOne(queryWrapper);
     TkDeviceScriptEntity result = baseMapper.selectOne(queryWrapper);
-    return result == null ? null : result.getConvertJs();
+    return (result == null || result.getStatus() == 0) ? null : result.getConvertJs();
   }
   }
 
 
   @Override
   @Override