From cf4e70f3e5757f0204e5446198bfd20911299c5d Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Thu, 26 Sep 2024 16:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=202024=E5=B9=B49=E6=9C=8826=E6=97=A516:09:25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysTenantDetailServiceImpl.java       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java
index 90461bb..4f3c124 100644
--- a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java
@@ -13,6 +13,8 @@ import com.thing.common.core.enumeration.*;
 import com.thing.common.core.exception.ErrorCode;
 import com.thing.common.core.exception.SysException;
 import com.thing.common.core.utils.ConvertUtils;
+import com.thing.common.core.utils.DateTimeUtils;
+import com.thing.common.core.utils.TokenGenerator;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
 import com.thing.common.orm.utils.IdGenerator;
@@ -44,8 +46,10 @@ import com.thing.sys.tenant.mapper.SysTenantGroupMapper;
 import com.thing.sys.tenant.mapper.SysTenantMapper;
 import com.thing.sys.tenant.service.SysTenantDetailService;
 import com.thing.sys.tenant.service.SysTenantGroupService;
+import com.thing.thing.cache.service.ThingCache;
 import com.thing.thing.context.service.ThingManageContextService;
 import com.thing.thing.entity.entity.IotThingEntity;
+import com.thing.thing.model.entity.IotThingModelEntity;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationEventPublisher;
@@ -87,6 +91,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
     private final SysIndustryTypeService sysIndustryTypeService;
 
     private final ThingManageContextService thingManageContextService;
+    private final ThingCache thingCache;
     private final ApplicationEventPublisher applicationEventPublisher;
 
 
@@ -395,7 +400,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
                                     IotThingEntity iotThingEntity = new IotThingEntity()
                                             .setCode(item.getCode())
                                             .setName(item.getCode())
-                                            .setRealType("1")
+                                            .setRealType("0")
                                             .setEnableStatus("1")
                                             .setTemplateMark(TemplateMark.NO.getValue())
                                             .setType("默认物类型");
@@ -406,13 +411,20 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
                 if(CollectionUtil.isNotEmpty(codes)){
                     //修改分配企业数
                     thingManageContextService.updateModelAuthNumByCodes(codes);
-
                 }
             }
         }
         try {
             // 保存企业物至物管理表
-            thingManageContextService.saveModel(Collections.singletonList(thingCode));
+            IotThingModelEntity modelEntity = new IotThingModelEntity()
+                    .setCode(thingCode)
+                    .setToken(TokenGenerator.generateValue())
+                    .setRealType("0")
+                    .setGateway(GateWayStatus.NO_GATE_WAY.getValue())
+                    .setStatus(ThingStatus.NOT_CONNECTED.getCode())
+                    .setOrigin(QueueOriginType.MQTT_CLIENT.name())
+                    .setStatusTs(DateTimeUtils.getCurrentTime());
+            thingManageContextService.saveOneModel(modelEntity);
         } catch (Exception e) {
             throw new SysException("保存失败,请检查数据源配置");
         }