更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -17,6 +17,9 @@ import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 物联网设备信息
  *
@@ -116,4 +119,7 @@ public class DeviceInfo extends SuperMain {
     @Schema(description = "设备关联的扩展信息")
     private DeviceAboutInfo aboutInfo;
 
+    @Schema(description = "扩展信息")
+    private Map<String, Object> metaInfo = new HashMap<String, Object>();
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/mqtt/MqttConfig.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.domain.mqtt;
 
+import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -30,4 +31,7 @@ public class MqttConfig extends SuperMain {
 
     @Schema(description = "端口")
     private String port;
+
+    @Schema(description = "")
+    private DataState state = DataState.Enable;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissIotService.java

@@ -91,10 +91,12 @@ public class DevicePermissIotService {
         if (ObjectUtils.isNotEmpty(permisses)) {
             executorService.execute(() -> {
                 Map<String, List<DevicePermiss>> map = permisses.stream().collect(Collectors.groupingBy(DevicePermiss::getGateWayId));
+
                 map.forEach((gateWayId, tempList) -> {
                     GateWayPermissModel gateWayPermissModel = new GateWayPermissModel();
                     gateWayPermissModel.setGateWayId(gateWayId);
                     gateWayPermissModel.setGroupId(groupId);
+
                     List<DeviceAboutPermiss> devices = tempList.stream().map(it -> {
                         DeviceAboutPermiss permiss = new DeviceAboutPermiss();
                         permiss.setDeviceId(it.getDeviceId());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissService.java

@@ -136,6 +136,7 @@ public class DevicePermissService extends SuperService {
                     }
                 }
                 devicePermissDao.saveAll(permisses);
+
                 // 下发设备权限增加数据
                 devicePermissIotService.changeDeviceUser(permisses, 1, "");
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -333,9 +333,11 @@ public class IndexService extends SuperService {
         userAuthLoginModel.setClientSecret(clientSecret);
         userAuthLoginModel.setDeviceUserAgent(request.getHeader("user-agent"));
         if (userAuthLoginModel.getAccessTokenTimeOut() == null) {
+            // 默认3天
             userAuthLoginModel.setAccessTokenTimeOut(259200l);
         }
         if (userAuthLoginModel.getRefreshTokenTimeOut() == null) {
+            // 默认一年
             userAuthLoginModel.setRefreshTokenTimeOut(31536000L);
         }
         // 登录失败信息过期时间