Browse Source

emqx集成

七步才子 3 years ago
parent
commit
09d8be5dbb

+ 18 - 0
dao/src/main/java/cc/iotkit/dao/DeviceAclRepository.java

@@ -0,0 +1,18 @@
+package cc.iotkit.dao;
+
+import cc.iotkit.model.device.DeviceAclInfo;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface DeviceAclRepository extends MongoRepository<DeviceAclInfo, String> {
+
+    DeviceAclInfo findByProductKeyAndDeviceName(String productKey, String deviceName);
+
+    DeviceAclInfo findByClientId(String clientId);
+
+    List<DeviceAclInfo> findByDeviceName(String deviceName);
+
+}

+ 18 - 0
dao/src/main/java/cc/iotkit/dao/DeviceAuthRepository.java

@@ -0,0 +1,18 @@
+package cc.iotkit.dao;
+
+import cc.iotkit.model.device.DeviceAuthInfo;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface DeviceAuthRepository extends MongoRepository<DeviceAuthInfo, String> {
+
+    DeviceAuthInfo findByProductKeyAndDeviceName(String productKey, String deviceName);
+
+    DeviceAuthInfo findByClientId(String clientId);
+
+    List<DeviceAuthInfo> findByDeviceName(String deviceName);
+
+}

+ 38 - 0
model/src/main/java/cc/iotkit/model/device/DeviceAclInfo.java

@@ -0,0 +1,38 @@
+package cc.iotkit.model.device;
+
+import cc.iotkit.model.Owned;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Document
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeviceAclInfo {
+
+    @Id
+    private String id;
+
+    private String deviceId;
+
+    private String productKey;
+
+    private String deviceName;
+
+    private String topic;
+
+    private String access;
+
+    private String parentId;
+
+}

+ 40 - 0
model/src/main/java/cc/iotkit/model/device/DeviceAuthInfo.java

@@ -0,0 +1,40 @@
+package cc.iotkit.model.device;
+
+import cc.iotkit.model.Owned;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Document
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeviceAuthInfo {
+
+    @Id
+    private String id;
+
+    private String deviceId;
+
+    private String productKey;
+
+    private String deviceName;
+
+    private String clientId;
+
+    private String userName;
+
+    private String password;
+
+    private String salt;
+
+}

+ 4 - 0
protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java

@@ -134,6 +134,10 @@ public class DeviceBehaviourService {
             device.setState(new DeviceInfo.State(false, null, null));
             device.setCreateAt(System.currentTimeMillis());
             reportMsg = true;
+
+
+            //auth、acl
+
         }
 
         //透传设备,默认在线