修改

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class BaseEntity implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
@@ -50,6 +52,7 @@ public class BaseEntity implements Serializable {
     /**
      * 更新时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblBreakdownController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 故障管理
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDatapointController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 点位数据
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentCodeController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备编码
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentOrganizationalController.java

@@ -23,12 +23,13 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.data.domain.vo.TblEquipmentOrganizationalVo;
 import com.ruoyi.data.domain.bo.TblEquipmentOrganizationalBo;
 import com.ruoyi.data.service.ITblEquipmentOrganizationalService;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 设备组织机构
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor
@@ -43,9 +44,8 @@ public class TblEquipmentOrganizationalController extends BaseController {
      */
     @SaCheckPermission("data:equipmentOrganizational:list")
     @GetMapping("/list")
-    public R<List<TblEquipmentOrganizationalVo>> list(TblEquipmentOrganizationalBo bo) {
-        List<TblEquipmentOrganizationalVo> list = iTblEquipmentOrganizationalService.queryList(bo);
-        return R.ok(list);
+    public TableDataInfo<TblEquipmentOrganizationalVo> list(TblEquipmentOrganizationalBo bo, PageQuery pageQuery) {
+        return iTblEquipmentOrganizationalService.queryPageList(bo, pageQuery);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSbookController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备台账
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSenesorController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备传感器连接
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentTagController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备标签
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblGatewayController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 网关管理
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusRtuController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * modbus_rtu配置
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusTcpController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * modbus_tcp协议配置
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * mqtt配置
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttInfoTopicController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblMqttInfoTopicVo;
+import com.ruoyi.data.domain.bo.TblMqttInfoTopicBo;
+import com.ruoyi.data.service.ITblMqttInfoTopicService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * mqtt服务和主题链接
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/mqttInfoTopic")
+public class TblMqttInfoTopicController extends BaseController {
+
+    private final ITblMqttInfoTopicService iTblMqttInfoTopicService;
+
+    /**
+     * 查询mqtt服务和主题链接列表
+     */
+    @SaCheckPermission("data:mqttInfoTopic:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblMqttInfoTopicVo> list(TblMqttInfoTopicBo bo, PageQuery pageQuery) {
+        return iTblMqttInfoTopicService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出mqtt服务和主题链接列表
+     */
+    @SaCheckPermission("data:mqttInfoTopic:export")
+    @Log(title = "mqtt服务和主题链接", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblMqttInfoTopicBo bo, HttpServletResponse response) {
+        List<TblMqttInfoTopicVo> list = iTblMqttInfoTopicService.queryList(bo);
+        ExcelUtil.exportExcel(list, "mqtt服务和主题链接", TblMqttInfoTopicVo.class, response);
+    }
+
+    /**
+     * 获取mqtt服务和主题链接详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:mqttInfoTopic:query")
+    @GetMapping("/{id}")
+    public R<TblMqttInfoTopicVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblMqttInfoTopicService.queryById(id));
+    }
+
+    /**
+     * 新增mqtt服务和主题链接
+     */
+    @SaCheckPermission("data:mqttInfoTopic:add")
+    @Log(title = "mqtt服务和主题链接", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblMqttInfoTopicBo bo) {
+        return toAjax(iTblMqttInfoTopicService.insertByBo(bo));
+    }
+
+    /**
+     * 修改mqtt服务和主题链接
+     */
+    @SaCheckPermission("data:mqttInfoTopic:edit")
+    @Log(title = "mqtt服务和主题链接", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblMqttInfoTopicBo bo) {
+        return toAjax(iTblMqttInfoTopicService.updateByBo(bo));
+    }
+
+    /**
+     * 删除mqtt服务和主题链接
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:mqttInfoTopic:remove")
+    @Log(title = "mqtt服务和主题链接", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblMqttInfoTopicService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleExecuteController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则条件列
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleFilterController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则执行列
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSeneorController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 传感器列
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSensorSbookController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 传感器台账
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 视频
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoDetailController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 摄像机详情
  *
  * @author ruoyi
- * @date 2023-12-01
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblWarnController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 告警管理
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblBreakdown.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 故障管理对象 tbl_breakdown
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -77,21 +77,5 @@ public class TblBreakdown extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifer;
-    /**
-     * 更新时间
-     */
-    private Date utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblDatapoint.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 点位数据对象 tbl_datapoint
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -65,21 +63,5 @@ public class TblDatapoint extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private String utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipment.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 设备对象 tbl_equipment
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -66,22 +64,6 @@ public class TblEquipment extends BaseEntity {
      */
     private String pictures;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentCode.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备编码对象 tbl_equipment_code
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentOrganizational.java

@@ -7,20 +7,18 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.TreeEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 设备组织机构对象 tbl_equipment_organizational
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tbl_equipment_organizational")
-public class TblEquipmentOrganizational extends TreeEntity<TblEquipmentOrganizational> {
+public class TblEquipmentOrganizational extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -34,6 +32,10 @@ public class TblEquipmentOrganizational extends TreeEntity<TblEquipmentOrganizat
      */
     private String sn;
     /**
+     * 上层位置
+     */
+    private Long parentId;
+    /**
      * 区域名称
      */
     private String name;
@@ -42,22 +44,6 @@ public class TblEquipmentOrganizational extends TreeEntity<TblEquipmentOrganizat
      */
     private String company;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSbook.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备台账对象 tbl_equipment_sbook
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -122,22 +122,6 @@ public class TblEquipmentSbook extends BaseEntity {
      */
     private String supplier;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSenesor.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备传感器连接对象 tbl_equipment_senesor
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentTag.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备标签对象 tbl_equipment_tag
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblGateway.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 网关管理对象 tbl_gateway
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -74,21 +72,5 @@ public class TblGateway extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusRtu.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * modbus_rtu配置对象 tbl_modbus_rtu
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -80,22 +78,6 @@ public class TblModbusRtu extends BaseEntity {
     /**
      * 
      */
-    private String creator;
-    /**
-     * 
-     */
-    private Date ctime;
-    /**
-     * 
-     */
-    private String modifier;
-    /**
-     * 
-     */
-    private Date utime;
-    /**
-     * 
-     */
     private String remark;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusTcp.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * modbus_tcp协议配置对象 tbl_modbus_tcp
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -65,21 +63,5 @@ public class TblModbusTcp extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqtt.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * mqtt配置对象 tbl_mqtt
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -66,20 +64,8 @@ public class TblMqtt extends BaseEntity {
      */
     private String remark;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
+     * mqtt状态 0：关闭，1：启用
      */
-    private Date utime;
+    private Long status;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqttInfoTopic.java

@@ -0,0 +1,39 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * mqtt服务和主题链接对象 tbl_mqtt_info_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_mqtt_info_topic")
+public class TblMqttInfoTopic extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * mqtt服务id
+     */
+    private Long mqttId;
+    /**
+     * mqtt主题id
+     */
+    private Long topicId;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRule.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则对象 tbl_rule
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -62,22 +62,6 @@ public class TblRule extends BaseEntity {
      */
     private String description;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleExecute.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 规则条件列对象 tbl_rule_execute
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -46,22 +44,6 @@ public class TblRuleExecute extends BaseEntity {
      */
     private String executeAction;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleFilter.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 规则执行列对象 tbl_rule_filter
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -54,22 +52,6 @@ public class TblRuleFilter extends BaseEntity {
      */
     private String formula;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSeneor.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 传感器列对象 tbl_seneor
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSensorSbook.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 传感器台账对象 tbl_sensor_sbook
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -82,22 +80,6 @@ public class TblSensorSbook extends BaseEntity {
      */
     private String description;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblUnit.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 单位对象 tbl_unit
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,57 +23,41 @@ public class TblUnit extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     *
+     * 
      */
-    @TableId
+    @TableId(value = "id")
     private Long id;
     /**
-     *
+     * 
      */
     private String name;
     /**
-     *
+     * 
      */
     private String unitSymbol;
     /**
-     *
+     * 
      */
     private String unitName;
     /**
-     *
+     * 
      */
     private String isStandard;
     /**
-     *
+     * 
      */
     private String unitType;
     /**
-     *
+     * 
      */
     private Long toStandardRatio;
     /**
-     *
+     * 
      */
     private Long toOffset;
     /**
-     *
+     * 
      */
     private String remark;
-    /**
-     *
-     */
-    private String creator;
-    /**
-     *
-     */
-    private Date ctime;
-    /**
-     *
-     */
-    private String modifier;
-    /**
-     *
-     */
-    private Date utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideo.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 视频对象 tbl_video
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -66,22 +64,6 @@ public class TblVideo extends BaseEntity {
      */
     private String serialNumber;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideoDetail.java

@@ -7,15 +7,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 摄像机详情对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-12-01
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -70,22 +68,6 @@ public class TblVideoDetail extends BaseEntity {
      */
     private String isSupportBoardcast;
     /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
-    /**
      * 备注
      */
     private String remark;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblWarn.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 告警管理对象 tbl_warn
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -77,21 +77,5 @@ public class TblWarn extends BaseEntity {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date ctime;
-    /**
-     * 更新人
-     */
-    private String modifier;
-    /**
-     * 更新时间
-     */
-    private Date utime;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblBreakdownBo.java

@@ -101,29 +101,29 @@ public class TblBreakdownBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifer;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifer;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblDatapointBo.java

@@ -83,29 +83,29 @@ public class TblDatapointBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentBo.java

@@ -83,29 +83,29 @@ public class TblEquipmentBo extends BaseEntity {
 //    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pictures;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentOrganizationalBo.java

@@ -47,29 +47,29 @@ public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganiz
     @NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
     private String company;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java

@@ -167,29 +167,29 @@ public class TblEquipmentSbookBo extends BaseEntity {
 //    @NotBlank(message = "供货厂家不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplier;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblGatewayBo.java

@@ -87,31 +87,8 @@ public class TblGatewayBo extends BaseEntity {
      * 备注
      */
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
-//    private String remark;
+    private String remark;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusRtuBo.java

@@ -101,29 +101,29 @@ public class TblModbusRtuBo extends BaseEntity {
 //    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String interval;
 
-    /**
-     *
-     */
-//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     *
-     */
-//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     *
-     */
-//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     *
-     */
-//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     *
+//     */
+////    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     *
+//     */
+////    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     *
+//     */
+////    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     *
+//     */
+////    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      *

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusTcpBo.java

@@ -83,29 +83,29 @@ public class TblModbusTcpBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblMqttInfoTopicBo.java

@@ -0,0 +1,43 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * mqtt服务和主题链接业务对象 tbl_mqtt_info_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblMqttInfoTopicBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * mqtt服务id
+     */
+    @NotNull(message = "mqtt服务id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long mqttId;
+
+    /**
+     * mqtt主题id
+     */
+    @NotNull(message = "mqtt主题id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long topicId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleBo.java

@@ -77,29 +77,29 @@ public class TblRuleBo extends BaseEntity {
 //    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleExecuteBo.java

@@ -53,29 +53,29 @@ public class TblRuleExecuteBo extends BaseEntity {
 //    @NotBlank(message = "执行动作不能为空", groups = { AddGroup.class, EditGroup.class })
     private String executeAction;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleFilterBo.java

@@ -64,30 +64,30 @@ public class TblRuleFilterBo extends BaseEntity {
      */
 //    @NotBlank(message = "公式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String formula;
-
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorSbookBo.java

@@ -107,29 +107,29 @@ public class TblSensorSbookBo extends BaseEntity {
 //    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblUnitBo.java

@@ -77,10 +77,10 @@ public class TblUnitBo extends BaseEntity {
     private Long toOffset;
 
     private String remark;
-    private String creator;
-    private Date ctime;
-    private String modifier;
-    private Date utime;
+//    private String creator;
+//    private Date ctime;
+//    private String modifier;
+//    private Date utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoBo.java

@@ -83,29 +83,29 @@ public class TblVideoBo extends BaseEntity {
 //    @NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serialNumber;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoDetailBo.java

@@ -89,29 +89,29 @@ public class TblVideoDetailBo extends BaseEntity {
 //    @NotBlank(message = "是否支持组播不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isSupportBoardcast;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
     /**
      * 备注

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblWarnBo.java

@@ -101,29 +101,29 @@ public class TblWarnBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-    /**
-     * 创建人
-     */
-//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date utime;
+//    /**
+//     * 创建人
+//     */
+////    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String creator;
+//
+//    /**
+//     * 创建时间
+//     */
+////    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date ctime;
+//
+//    /**
+//     * 更新人
+//     */
+////    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String modifier;
+//
+//    /**
+//     * 更新时间
+//     */
+////    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private Date utime;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblBreakdownVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 故障管理视图对象 tbl_breakdown
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -101,29 +101,5 @@ public class TblBreakdownVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifer;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblDatapointVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 点位数据视图对象 tbl_datapoint
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -83,29 +81,5 @@ public class TblDatapointVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private String utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentCodeVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 设备编码视图对象 tbl_equipment_code
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentOrganizationalVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 设备组织机构视图对象 tbl_equipment_organizational
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -54,30 +52,6 @@ public class TblEquipmentOrganizationalVo implements Serializable {
     private String company;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 设备台账视图对象 tbl_equipment_sbook
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -168,30 +168,6 @@ public class TblEquipmentSbookVo implements Serializable {
     private String supplier;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSenesorVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 设备传感器连接视图对象 tbl_equipment_senesor
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentTagVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 设备标签视图对象 tbl_equipment_tag
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 设备视图对象 tbl_equipment
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -84,30 +82,6 @@ public class TblEquipmentVo implements Serializable {
     private String pictures;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblGatewayVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 网关管理视图对象 tbl_gateway
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -89,29 +87,5 @@ public class TblGatewayVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusRtuVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * modbus_rtu配置视图对象 tbl_modbus_rtu
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -105,30 +103,6 @@ public class TblModbusRtuVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String creator;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Date ctime;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String modifier;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Date utime;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusTcpVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * modbus_tcp协议配置视图对象 tbl_modbus_tcp
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -84,29 +82,5 @@ public class TblModbusTcpVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttInfoTopicVo.java

@@ -0,0 +1,43 @@
+package com.ruoyi.data.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * mqtt服务和主题链接视图对象 tbl_mqtt_info_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblMqttInfoTopicVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * mqtt服务id
+     */
+    @ExcelProperty(value = "mqtt服务id")
+    private Long mqttId;
+
+    /**
+     * mqtt主题id
+     */
+    @ExcelProperty(value = "mqtt主题id")
+    private Long topicId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * mqtt配置视图对象 tbl_mqtt
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -84,28 +82,10 @@ public class TblMqttVo implements Serializable {
     private String remark;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
+     * mqtt状态 0：关闭，1：启用
      */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
+    @ExcelProperty(value = "mqtt状态 0：关闭，1：启用")
+    private Long status;
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleExecuteVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 规则条件列视图对象 tbl_rule_execute
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -54,30 +52,6 @@ public class TblRuleExecuteVo implements Serializable {
     private String executeAction;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleFilterVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 规则执行列视图对象 tbl_rule_filter
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -66,30 +64,6 @@ public class TblRuleFilterVo implements Serializable {
     private String formula;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 规则视图对象 tbl_rule
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -78,30 +78,6 @@ public class TblRuleVo implements Serializable {
     private String description;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSeneorVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 传感器列视图对象 tbl_seneor
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSensorSbookVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 传感器台账视图对象 tbl_sensor_sbook
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -108,30 +106,6 @@ public class TblSensorSbookVo implements Serializable {
     private String description;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblUnitVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 单位视图对象 tbl_unit
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -77,29 +75,5 @@ public class TblUnitVo implements Serializable {
     @ExcelProperty(value = "")
     private String remark;
 
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String creator;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Date ctime;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String modifier;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Date utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoDetailVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 摄像机详情视图对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-12-01
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -90,30 +88,6 @@ public class TblVideoDetailVo implements Serializable {
     private String isSupportBoardcast;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.data.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -15,7 +13,7 @@ import java.io.Serializable;
  * 视频视图对象 tbl_video
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -84,30 +82,6 @@ public class TblVideoVo implements Serializable {
     private String serialNumber;
 
     /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
-    /**
      * 备注
      */
     @ExcelProperty(value = "备注")

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblWarnVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 告警管理视图对象 tbl_warn
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -101,29 +101,5 @@ public class TblWarnVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private String creator;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty(value = "创建时间")
-    private Date ctime;
-
-    /**
-     * 更新人
-     */
-    @ExcelProperty(value = "更新人")
-    private String modifier;
-
-    /**
-     * 更新时间
-     */
-    @ExcelProperty(value = "更新时间")
-    private Date utime;
-
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblBreakdownMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 故障管理Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblBreakdownMapper extends BaseMapperPlus<TblBreakdownMapper, TblBreakdown, TblBreakdownVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblDatapointMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 点位数据Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblDatapointMapper extends BaseMapperPlus<TblDatapointMapper, TblDatapoint, TblDatapointVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentCodeMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备编码Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentCodeMapper extends BaseMapperPlus<TblEquipmentCodeMapper, TblEquipmentCode, TblEquipmentCodeVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentMapper extends BaseMapperPlus<TblEquipmentMapper, TblEquipment, TblEquipmentVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentOrganizationalMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备组织机构Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentOrganizationalMapper extends BaseMapperPlus<TblEquipmentOrganizationalMapper, TblEquipmentOrganizational, TblEquipmentOrganizationalVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSbookMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备台账Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentSbookMapper extends BaseMapperPlus<TblEquipmentSbookMapper, TblEquipmentSbook, TblEquipmentSbookVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSenesorMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备传感器连接Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentSenesorMapper extends BaseMapperPlus<TblEquipmentSenesorMapper, TblEquipmentSenesor, TblEquipmentSenesorVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentTagMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备标签Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblEquipmentTagMapper extends BaseMapperPlus<TblEquipmentTagMapper, TblEquipmentTag, TblEquipmentTagVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblGatewayMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 网关管理Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblGatewayMapper extends BaseMapperPlus<TblGatewayMapper, TblGateway, TblGatewayVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusRtuMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * modbus_rtu配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblModbusRtuMapper extends BaseMapperPlus<TblModbusRtuMapper, TblModbusRtu, TblModbusRtuVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusTcpMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * modbus_tcp协议配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblModbusTcpMapper extends BaseMapperPlus<TblModbusTcpMapper, TblModbusTcp, TblModbusTcpVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttInfoTopicMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblMqttInfoTopic;
+import com.ruoyi.data.domain.vo.TblMqttInfoTopicVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * mqtt服务和主题链接Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface TblMqttInfoTopicMapper extends BaseMapperPlus<TblMqttInfoTopicMapper, TblMqttInfoTopic, TblMqttInfoTopicVo> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * mqtt配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblMqttMapper extends BaseMapperPlus<TblMqttMapper, TblMqtt, TblMqttVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleExecuteMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 规则条件列Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblRuleExecuteMapper extends BaseMapperPlus<TblRuleExecuteMapper, TblRuleExecute, TblRuleExecuteVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleFilterMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 规则执行列Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblRuleFilterMapper extends BaseMapperPlus<TblRuleFilterMapper, TblRuleFilter, TblRuleFilterVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 规则Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblRuleMapper extends BaseMapperPlus<TblRuleMapper, TblRule, TblRuleVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblSeneorMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 传感器列Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-05
  */
 public interface TblSeneorMapper extends BaseMapperPlus<TblSeneorMapper, TblSeneor, TblSeneorVo> {