fix:初始化创建租户时，新增的默认两个产品给予默认规则链id

chenjunyu_1481036421
1 parent f56f3ed3
Showing 4 changed files with 19 additions and 17 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @3dafaa6
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @3dafaa6
@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -25,11 +26,13 @@ import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TenantReqDTO;
+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.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
@@ -65,6 +68,7 @@ public class TkAdminController extends BaseController {
   private final InstallScripts installScripts;
   private final TbUserService tbUserService;
   private final TbTenantService tbTenantService;
+  private final RuleChainService ruleChainService;
   @PostMapping("/tenant")
   @Deprecated
@@ -286,6 +290,11 @@ public class TkAdminController extends BaseController {
       installScripts.createDefaultRuleChains(tbTenant.getId());
       installScripts.createDefaultEdgeRuleChains(tbTenant.getId());
     }
+    //Thingskit function
+    RuleChain ruleChain  =ruleChainService.getRootTenantRuleChain(tbTenant.getId());
+    deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT网关设备", DeviceTypeEnum.GATEWAY,ruleChain.getId());
+    deviceProfileService.createDeviceProfile(tbTenant.getId(),"默认MQTT直连设备", DeviceTypeEnum.DIRECT_CONNECTION,ruleChain.getId());
+
     tenantProfileCache.evict(tbTenant.getId());
     tbClusterService.onTenantChange(tbTenant, null);
     tbClusterService.broadcastEntityStateChangeEvent(
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
View file @3dafaa6
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
View file @3dafaa6
@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileInfo;
 import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -57,7 +58,7 @@ public interface DeviceProfileService extends EntityDaoService {
     DeviceProfile createDefaultDeviceProfile(TenantId tenantId);
 	//thingskit
-    DeviceProfile createDeviceProfile(TenantId tenantId, String name, DeviceTypeEnum deviceType);
+    DeviceProfile createDeviceProfile(TenantId tenantId, String name, DeviceTypeEnum deviceType, RuleChainId ruleChainId);
     ListenableFuture<List<DeviceProfile>> findByDataCombinationIsTrue();
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
View file @3dafaa6
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
View file @3dafaa6
@@ -37,10 +37,7 @@ import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTra
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.device.profile.DisabledDeviceProfileProvisionConfiguration;
 import org.thingsboard.server.common.data.device.profile.X509CertificateChainProvisionConfiguration;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.HasId;
-import org.thingsboard.server.common.data.id.TenantId;
+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.core.message.ErrorMessage;
@@ -277,7 +274,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         DeviceProfile deviceProfile = findDeviceProfileByName(tenantId, name, false);
         if (deviceProfile == null) {
             try {
-                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, name.equals("default"), DeviceTypeEnum.SENSOR);
+                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, name.equals("default"), DeviceTypeEnum.SENSOR,null);
             } catch (DataValidationException e) {
                 if (DEVICE_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     deviceProfile = findDeviceProfileByName(tenantId, name, false);
@@ -292,13 +289,13 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile createDefaultDeviceProfile(TenantId tenantId) {
         log.trace("Executing createDefaultDeviceProfile tenantId [{}]", tenantId);
-        return doCreateDefaultDeviceProfile(tenantId, "default", true, DeviceTypeEnum.SENSOR);
+        return doCreateDefaultDeviceProfile(tenantId, "default", true, DeviceTypeEnum.SENSOR,null);
     }
 	//thingskit
     @Override
-    public DeviceProfile createDeviceProfile(TenantId tenantId, String name, DeviceTypeEnum deviceType) {
+    public DeviceProfile createDeviceProfile(TenantId tenantId, String name, DeviceTypeEnum deviceType, RuleChainId ruleChainId) {
         log.trace("Executing createDeviceProfile tenantId [{}]", tenantId);
-        return doCreateDefaultDeviceProfile(tenantId, name, false,deviceType);
+        return doCreateDefaultDeviceProfile(tenantId, name, false,deviceType,ruleChainId);
     }
     @Override
@@ -306,7 +303,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         return deviceProfileDao.findByDataCombinationIsTrue();
     }
-    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, DeviceTypeEnum deviceType) {
+    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, DeviceTypeEnum deviceType, RuleChainId ruleChainId) {
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
@@ -319,6 +316,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         //thingsKit:begin
         deviceProfile.setDeviceType(deviceType);
+        deviceProfile.setDefaultRuleChainId(ruleChainId);
         //thingsKit:end
         DeviceProfileData deviceProfileData = new DeviceProfileData();
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @3dafaa6
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @3dafaa6
@@ -184,7 +184,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     @Override
     @Transactional
-    public Tenant saveTenant(Tenant tenant) {
+    public Tenant  saveTenant(Tenant tenant) {
         log.trace("Executing saveTenant [{}]", tenant);
         tenant.setRegion(DEFAULT_TENANT_REGION);
         if (tenant.getTenantProfileId() == null) {
@@ -199,12 +199,6 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
         if (tenant.getId() == null) {
             deviceProfileService.createDefaultDeviceProfile(savedTenant.getId());
             assetProfileService.createDefaultAssetProfile(savedTenant.getId());
-			//Thingskit function
-            deviceProfileService.createDeviceProfile(savedTenant.getId(),"默认MQTT网关设备", DeviceTypeEnum.GATEWAY);
-            deviceProfileService.createDeviceProfile(savedTenant.getId(),"默认MQTT直连设备", DeviceTypeEnum.DIRECT_CONNECTION);
-
-
-
             apiUsageStateService.createDefaultApiUsageState(savedTenant.getId(), null);
             try {
                 notificationSettingsService.createDefaultNotificationConfigs(savedTenant.getId());