新增 设备管理实体类

src/main/java/com/yunfeiyun/agmp/iot/common/constant/device/xmzn/XmznUtil.java

@@ -189,12 +189,12 @@ public class XmznUtil {
 
         //根据subtype判断，废弃
 
-        if(XmznEnumDevsubtype.TYPE_1.getCode().equals(device.getDevSubtype())
-                ||XmznEnumDevsubtype.TYPE_2.getCode().equals(device.getDevSubtype())
-                ||XmznEnumDevsubtype.TYPE_3.getCode().equals(device.getDevSubtype())
-                ||XmznEnumDevsubtype.TYPE_6.getCode().equals(device.getDevSubtype())){
-            return true;
-        }
+//        if(XmznEnumDevsubtype.TYPE_1.getCode().equals(device.getDevSubtype())
+//                ||XmznEnumDevsubtype.TYPE_2.getCode().equals(device.getDevSubtype())
+//                ||XmznEnumDevsubtype.TYPE_3.getCode().equals(device.getDevSubtype())
+//                ||XmznEnumDevsubtype.TYPE_6.getCode().equals(device.getDevSubtype())){
+//            return true;
+//        }
 
         if(IotDeviceDictConst.TYPE_XMZN_PNHJJC.equals(device.getDevtypeBid())
         ||IotDeviceDictConst.TYPE_XMZN_QXZ.equals(device.getDevtypeBid())

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotDevice.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024-11-06
  */
 @Data
-public class IotDevice extends BaseEntity
+public class IotDevice extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotDeviceconn.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -11,7 +10,7 @@ import lombok.Data;
  * @date 2024-11-06
  */
 @Data
-public class IotDeviceconn extends BaseEntity
+public class IotDeviceconn extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/yunfeiyun/agmp/iot/common/domain/TosDeviceclass.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -11,7 +10,7 @@ import lombok.Data;
  * @date 2024-11-06
  */
 @Data
-public class TosDeviceclass extends BaseEntity {
+public class TosDeviceclass extends IotBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 自增主键 */

src/main/java/com/yunfeiyun/agmp/iot/common/domain/TosDevicetype.java

@@ -1,10 +1,7 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 设备类型对象 TosDevicetype
@@ -13,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2024-11-06
  */
 @Data
-public class TosDevicetype extends BaseEntity {
+public class TosDevicetype extends IotBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 自增主键 */

src/main/java/com/yunfeiyun/agmp/iot/common/domain/TosFirm.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -11,7 +10,7 @@ import lombok.Data;
  * @date 2024-11-06
  */
 @Data
-public class TosFirm extends BaseEntity{
+public class TosFirm extends IotBaseEntity{
     private static final long serialVersionUID = 1L;
 
     /** 自增主键 */