更新！ 取消GateWay信息

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/iot/IotTemplate2DeviceDao.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.dao.iot;
 import com.zhongshu.iot.server.core.dao.iot.extend.IotTemplate2DeviceDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 /**

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/DeviceInfoDao.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.dao.mqtt;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.RegistType;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.DeviceInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/DeviceOnLineInfoDao.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceOnLineInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceOnLineInfo;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 /**

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/DevicePingInfoDao.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DevicePingInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DevicePingInfo;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/GateWay2DeviceDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWay2Device;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/GateWay2UserDao.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2User;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWay2User;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/GateWayMqttSecurityDao.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayMqttSecurity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayMqttSecurity;
+import com.zhongshu.iot.server.core.domain.iot.device.MqttInfo;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/GateWayUserInfoDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.GateWayUserInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/GateWayUserInfoTempDao.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfoTemp;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfoTemp;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/Mqtt2UserDao.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.Mqtt2User;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.Mqtt2User;
+import com.zhongshu.iot.server.core.domain.iot.device.MqttInfo;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/MqttInfoDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.client.type.type.AddressType;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.MqttInfo;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/OperationLogsDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationLogsDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationLogs;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationLogs;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/OperationMessageDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/OperationMessageResultDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageResultDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/ProjectInfoDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.ProjectInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/DeviceInfoDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/GateWayUserInfoDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
 import com.zhongshu.iot.client.model.mqtt.GateWayUserInfoSearchParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationLogsDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationLogs;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationLogs;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsSearchParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationMessageDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
 import com.zhongshu.iot.client.model.artemis.OperationMessageSearchParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationMessageResultDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
 import com.zhongshu.iot.client.model.artemis.OperationMessageResultSearch;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/ProjectInfoDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/DeviceInfoDaoImpl.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.DeviceInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/GateWayUserInfoDaoImpl.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.mqtt.GateWayUserInfoSearchParam;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.GateWayUserInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationLogsDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.dao.mqtt.impl;
 
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationLogsDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationLogs;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationLogs;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsSearchParam;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationMessageDaoImpl.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.artemis.OperationMessageSearchParam;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.TokenUtil;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationMessageResultDaoImpl.java

@@ -6,8 +6,7 @@ import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageResultDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessageResult;
-import com.zhongshu.iot.server.core.util.CommonUtil;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/ProjectInfoDaoImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.dao.mqtt.impl;
 
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.ProjectInfoDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/docker/AkSkConfig.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.domain.docker;
 
 import com.zhongshu.iot.client.type.DataState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/IotDeviceData.java

@@ -1,5 +1,7 @@
 package com.zhongshu.iot.server.core.domain.iot;
 
+import com.github.microservice.types.deviceUse.IotDeviceDataType;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.iot.client.model.iot.IotAttribute;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,6 +28,9 @@ public class IotDeviceData extends SuperEntity {
     @Schema(description = "所属模版ID")
     private String iotTemplateId;
 
+    @Schema(description = "关联物模型信息")
+    private String iotThingId;
+
     @Schema(description = "关联的设备")
     private String deviceId;
 
@@ -37,4 +42,36 @@ public class IotDeviceData extends SuperEntity {
 
     @Schema(description = "对应的值")
     private Object data;
+
+    @Schema(description = "数据类型，如：当前数据，历史数据")
+    private IotDeviceDataType dataType;
+
+    //------------------------------时间信息 start--------------------
+    @Schema(description = "年份，如：2024")
+    private Integer year;
+
+    @Schema(description = "月份，如：6")
+    private Integer month;
+
+    @Schema(description = "当前月的第几天")
+    private Integer dayOfMonth;
+
+    @Schema(description = "今年第几周,如：32")
+    private Integer week;
+
+    @Schema(description = "当前年的第几天")
+    private Integer dayOfYear;
+
+    @Schema(description = "当前的第几小时")
+    private Integer hourOfDay;
+
+    public void setTimes() {
+        this.year = DateUtils.getCurrentYear();
+        this.month = DateUtils.getCurrentMonthInYear();
+        this.dayOfMonth = DateUtils.getCurrentDayInMonth();
+        this.hourOfDay = DateUtils.getCurrentHourOfDay();
+
+        this.dayOfYear = DateUtils.getCurrentDayInYear();
+        this.week = DateUtils.getCurrentWeekInYear();
+    }
 }

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/IotTemplate2Device.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.domain.iot;
 
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/IotThing2Device.java

@@ -4,8 +4,8 @@ import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/DeviceInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/DeviceInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import cn.hutool.json.JSONObject;
 import com.github.microservice.types.deviceUse.*;
@@ -23,6 +23,12 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 public class DeviceInfo extends SuperEntity {
 
+    @Schema(description = "在线状态")
+    private OnLineState onLineState;
+
+    @Schema(description = "数据状态")
+    private DeviceState state = DeviceState.Enable;
+
     @Schema(description = "mqtt账号名称")
     private String mqttUserName;
 
@@ -47,12 +53,6 @@ public class DeviceInfo extends SuperEntity {
     @Schema(description = "设备型号")
     private DeviceSpecType specType;
 
-    @Schema(description = "在线状态")
-    private OnLineState onLineState;
-
-    @Schema(description = "数据状态")
-    private DeviceState state = DeviceState.Enable;
-
     @Schema(description = "ip地址")
     private String ip;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/DeviceOnLineInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/DeviceOnLineInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/DevicePingInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/DevicePingInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/GateWay2Device.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/GateWay2Device.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/GateWay2User.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/GateWay2User.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/GateWayMqttSecurity.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/GateWayMqttSecurity.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/GateWayUserInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/GateWayUserInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.client.type.type.MqttUserState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/GateWayUserInfoTemp.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/GateWayUserInfoTemp.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/Mqtt2User.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/Mqtt2User.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/MqttInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/MqttInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.client.type.type.AddressType;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/OperationLogs.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/OperationLogs.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.zhongshu.iot.client.type.MessageType;
 import com.zhongshu.iot.client.type.OperationLogType;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/OperationMessage.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/OperationMessage.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import cn.hutool.json.JSONObject;
 import com.zhongshu.iot.client.type.OperationType;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/OperationMessageResult.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/OperationMessageResult.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import cn.hutool.json.JSONObject;
 import com.zhongshu.iot.client.type.OperationType;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/ProjectInfo.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/ProjectInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.mqtt;
+package com.zhongshu.iot.server.core.domain.iot.device;
 
 import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/user/User.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.domain.user;
 import com.zhongshu.iot.client.type.UserState;
 import com.zhongshu.iot.client.type.UserType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/listener/MongodbAutoEvent.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.listener;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceOnLineInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceOnLineInfo;
 import com.zhongshu.iot.server.core.service.device.DevicePingInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/artemis/OperationMessageService.java

@@ -21,9 +21,9 @@ import com.zhongshu.iot.server.core.dao.mqtt.OperationMessageResultDao;
 import com.zhongshu.iot.server.core.dao.other.ExecuteMethodInfoDao;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessage;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
 import com.zhongshu.iot.server.core.domain.other.ExecuteMethodInfo;
 import com.zhongshu.iot.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceInfoService.java

@@ -2,7 +2,6 @@ package com.zhongshu.iot.server.core.service.device;
 
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
-import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.client.model.iot.IotMainModel;
@@ -18,9 +17,8 @@ import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
 import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;
 import com.zhongshu.iot.server.core.service.iot.IotThingService;
 import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DevicePingInfoService.java

@@ -11,10 +11,10 @@ import com.zhongshu.iot.server.core.dao.mqtt.DeviceOnLineInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DevicePingInfoDao;
 import com.zhongshu.iot.server.core.dataConfig.CommonTTLTimeConfig;
 import com.zhongshu.iot.server.core.domain.iot.IotThing2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceOnLineInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DevicePingInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceOnLineInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DevicePingInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWay2Device;
 import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.RedisService;
 import com.zhongshu.iot.server.core.service.base.SuperService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceStatisticsService.java

@@ -0,0 +1,10 @@
+package com.zhongshu.iot.server.core.service.device;
+
+/**
+ * 设备统计服务
+ *
+ * @author TRX
+ * @date 2025/2/27
+ */
+public class DeviceStatisticsService {
+}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/GateWayManagerService.java

@@ -12,7 +12,7 @@ import com.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.*;
+import com.zhongshu.iot.server.core.domain.iot.device.*;
 import com.zhongshu.iot.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/GateWayUserInfoService.java

@@ -8,7 +8,7 @@ import com.zhongshu.iot.client.type.type.LogsLevel;
 import com.zhongshu.iot.client.type.type.MqttUserState;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.*;
+import com.zhongshu.iot.server.core.domain.iot.device.*;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.CommonUtil;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/JMXSyncService.java

@@ -5,7 +5,7 @@ import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.RegistType;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.*;
+import com.zhongshu.iot.server.core.domain.iot.device.*;
 import com.zhongshu.iot.server.core.service.iotPlatform.PlatformTopic;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.JMXUtil;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/MqttInfoService.java

@@ -8,7 +8,7 @@ import com.zhongshu.iot.client.model.mqtt.MqttInfoSimpleModel;
 import com.zhongshu.iot.client.type.type.AddressType;
 import com.zhongshu.iot.server.core.dao.mqtt.Mqtt2UserDao;
 import com.zhongshu.iot.server.core.dao.mqtt.MqttInfoDao;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.MqttInfo;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/ProjectInfoService.java

@@ -7,7 +7,7 @@ import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSimpleModel;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/fix/FixDataService.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.service.fix;
 
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/groovy/GroovySupport.java

@@ -1,10 +1,9 @@
 package com.zhongshu.iot.server.core.service.groovy;
 
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.DateUtils;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotSendMessageService.java

@@ -15,9 +15,9 @@ import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.OperationMessageDao;
 import com.zhongshu.iot.server.core.dao.mqtt.OperationMessageResultDao;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessage;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.DateUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -14,8 +14,8 @@ import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
 import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.iot.*;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWay2Device;
 import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotTemplate2DeviceService.java

@@ -12,7 +12,7 @@ import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotTemplateManagerService.java

@@ -12,7 +12,7 @@ import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotThing2DeviceService.java

@@ -10,7 +10,7 @@ import com.zhongshu.iot.server.core.dao.iot.IotThing2DeviceDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;
 import com.zhongshu.iot.server.core.domain.iot.IotThing2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;
 import com.zhongshu.iot.server.core.service.device.ProjectInfoService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotThingService.java

@@ -15,8 +15,8 @@ import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;
 import com.zhongshu.iot.server.core.domain.iot.IotThing2Device;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/openApi/DeviceIotOpenApiService.java

@@ -13,7 +13,7 @@ import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
 import lombok.extern.slf4j.Slf4j;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/payment/HxzService.java

@@ -6,7 +6,7 @@ import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.domain.ExecuteAnnotationService;
 import com.zhongshu.iot.server.core.domain.ExecuteAnnotationServiceMethod;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.httpRequest.ApiRequestService;
 import com.github.microservice.http.APIResponseModel;
 import com.zhongshu.iot.server.core.httpRequest.conf.FullCardAPIConfig;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/sync/DeviceSyncFullCardService.java

@@ -7,8 +7,8 @@ import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWay2Device;
 import com.zhongshu.iot.server.core.event.DeviceOnLineTimeChangeEvent;
 import com.zhongshu.iot.server.core.event.DeviceStateChangeEvent;
 import com.zhongshu.iot.server.core.event.DeviceSyncEvent;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/OperationLogsService.java

@@ -8,8 +8,7 @@ import com.zhongshu.iot.client.type.type.LogsLevel;
 import com.zhongshu.iot.server.core.dao.UserDao;
 import com.zhongshu.iot.server.core.dao.mqtt.OperationLogsDao;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.OperationLogs;
-import com.zhongshu.iot.server.core.domain.user.User;
+import com.zhongshu.iot.server.core.domain.iot.device.OperationLogs;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/UserManagerServiceImpl.java

@@ -9,7 +9,7 @@ import com.zhongshu.iot.server.core.dao.RoleDao;
 import com.zhongshu.iot.server.core.dao.UserDao;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
 import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.domain.user.Department;
 import com.zhongshu.iot.server.core.domain.user.Role;
 import com.zhongshu.iot.server.core.domain.user.User;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/util/JMXUtil.java

@@ -5,9 +5,9 @@ import cn.hutool.json.JSONObject;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.server.core.dataConfig.DeviceConfig;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
-import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.MqttInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/util/mqtt/MqttTopicUtils.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.util.mqtt;
 
-import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayUserInfo;
+import com.zhongshu.iot.server.core.domain.iot.device.GateWayUserInfo;
 import org.apache.commons.lang3.StringUtils;
 
 /**