Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttInfoController.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.TblMqttInfoVo;
+import com.ruoyi.data.domain.bo.TblMqttInfoBo;
+import com.ruoyi.data.service.ITblMqttInfoService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * mqtt连接配置
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/mqttInfo")
+public class TblMqttInfoController extends BaseController {
+
+    private final ITblMqttInfoService iTblMqttInfoService;
+
+    /**
+     * 查询mqtt连接配置列表
+     */
+    @SaCheckPermission("data:mqttInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblMqttInfoVo> list(TblMqttInfoBo bo, PageQuery pageQuery) {
+        return iTblMqttInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出mqtt连接配置列表
+     */
+    @SaCheckPermission("data:mqttInfo:export")
+    @Log(title = "mqtt连接配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblMqttInfoBo bo, HttpServletResponse response) {
+        List<TblMqttInfoVo> list = iTblMqttInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "mqtt连接配置", TblMqttInfoVo.class, response);
+    }
+
+    /**
+     * 获取mqtt连接配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:mqttInfo:query")
+    @GetMapping("/{id}")
+    public R<TblMqttInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblMqttInfoService.queryById(id));
+    }
+
+    /**
+     * 新增mqtt连接配置
+     */
+    @SaCheckPermission("data:mqttInfo:add")
+    @Log(title = "mqtt连接配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblMqttInfoBo bo) {
+        return toAjax(iTblMqttInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改mqtt连接配置
+     */
+    @SaCheckPermission("data:mqttInfo:edit")
+    @Log(title = "mqtt连接配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblMqttInfoBo bo) {
+        return toAjax(iTblMqttInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除mqtt连接配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:mqttInfo:remove")
+    @Log(title = "mqtt连接配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblMqttInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttTopicController.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.TblMqttTopicVo;
+import com.ruoyi.data.domain.bo.TblMqttTopicBo;
+import com.ruoyi.data.service.ITblMqttTopicService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * mqtt主题信息
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/mqttTopic")
+public class TblMqttTopicController extends BaseController {
+
+    private final ITblMqttTopicService iTblMqttTopicService;
+
+    /**
+     * 查询mqtt主题信息列表
+     */
+    @SaCheckPermission("data:mqttTopic:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblMqttTopicVo> list(TblMqttTopicBo bo, PageQuery pageQuery) {
+        return iTblMqttTopicService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出mqtt主题信息列表
+     */
+    @SaCheckPermission("data:mqttTopic:export")
+    @Log(title = "mqtt主题信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblMqttTopicBo bo, HttpServletResponse response) {
+        List<TblMqttTopicVo> list = iTblMqttTopicService.queryList(bo);
+        ExcelUtil.exportExcel(list, "mqtt主题信息", TblMqttTopicVo.class, response);
+    }
+
+    /**
+     * 获取mqtt主题信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:mqttTopic:query")
+    @GetMapping("/{id}")
+    public R<TblMqttTopicVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblMqttTopicService.queryById(id));
+    }
+
+    /**
+     * 新增mqtt主题信息
+     */
+    @SaCheckPermission("data:mqttTopic:add")
+    @Log(title = "mqtt主题信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblMqttTopicBo bo) {
+        return toAjax(iTblMqttTopicService.insertByBo(bo));
+    }
+
+    /**
+     * 修改mqtt主题信息
+     */
+    @SaCheckPermission("data:mqttTopic:edit")
+    @Log(title = "mqtt主题信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblMqttTopicBo bo) {
+        return toAjax(iTblMqttTopicService.updateByBo(bo));
+    }
+
+    /**
+     * 删除mqtt主题信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:mqttTopic:remove")
+    @Log(title = "mqtt主题信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblMqttTopicService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,55 @@
+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
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_mqtt_info")
+public class TblMqttInfo extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * Mqtt地址
+     */
+    private String serverAddress;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 配置唯一uuid
+     */
+    private String uuid;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * mqtt状态 0：关闭，1：启用
+     */
+    private Long status;
+
+}

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

@@ -0,0 +1,55 @@
+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_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_mqtt_topic")
+public class TblMqttTopic extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主题id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 主题topic
+     */
+    private String topic;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 协议名称
+     */
+    private String protocolName;
+    /**
+     * 协议描述
+     */
+    private String protocolDesc;
+    /**
+     * 协议类型
+     */
+    private String protocolType;
+    /**
+     * 状态 0：关闭 1：启用
+     */
+    private Long status;
+
+}

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblBreakdownBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -68,19 +68,19 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 处理方式
      */
-    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handlerWay;
 
     /**
      * 处理描述
      */
-    @NotBlank(message = "处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handlerContent;
 
     /**
      * 处理时间
      */
-    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date handlerTime;
 
     /**
@@ -98,31 +98,31 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifer;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblDatapointBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -80,31 +80,31 @@ public class TblDatapointBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String utime;
 
 

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -44,13 +44,13 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 型号
      */
-    @NotBlank(message = "型号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "型号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String model;
 
     /**
      * 规格
      */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
     private String specs;
 
     /**
@@ -68,61 +68,61 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 生产商
      */
-    @NotBlank(message = "生产商不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "生产商不能为空", groups = { AddGroup.class, EditGroup.class })
     private String manufacturer;
 
     /**
      * 制造商
      */
-    @NotBlank(message = "制造商不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "制造商不能为空", groups = { AddGroup.class, EditGroup.class })
     private String producer;
 
     /**
      * 图片
      */
-    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pictures;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 拓展字段1
      */
-    @NotBlank(message = "拓展字段1不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "拓展字段1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
      * 拓展字段2
      */
-    @NotBlank(message = "拓展字段2不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "拓展字段2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentCodeBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -54,7 +54,7 @@ public class TblEquipmentCodeBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.TreeEntity;
 public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganizationalBo> {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -50,31 +50,31 @@ public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganiz
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentSbookBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -56,7 +56,7 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 设备信息
      */
-    @NotBlank(message = "设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentInfoId;
 
     /**
@@ -80,133 +80,133 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 负责人
      */
-    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String personInCharge;
 
     /**
      * 安装日期
      */
-    @NotNull(message = "安装日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "安装日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date installationDate;
 
     /**
      * 安装地点地址
      */
-    @NotBlank(message = "安装地点地址不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "安装地点地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String address;
 
     /**
      * 关联设备id
      */
-    @NotBlank(message = "关联设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "关联设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deviceId;
 
     /**
      * 标签
      */
-    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tagids;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 保修期结束日期
      */
-    @NotNull(message = "保修期结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "保修期结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date endOfWarrantyPeriod;
 
     /**
      * 制造日期
      */
-    @NotNull(message = "制造日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "制造日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date manufacturingDate;
 
     /**
      * 资产编码
      */
-    @NotBlank(message = "资产编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "资产编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String assetNo;
 
     /**
      * 资产编号
      */
-    @NotBlank(message = "资产编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "资产编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serialNumber;
 
     /**
      * 使用证编号
      */
-    @NotBlank(message = "使用证编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "使用证编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String useCertificateNo;
 
     /**
      * 安全级别
      */
-    @NotBlank(message = "安全级别不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "安全级别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String securityLevel;
 
     /**
      * 使用年限
      */
-    @NotNull(message = "使用年限不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "使用年限不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long usefulLife;
 
     /**
      * 变动日期
      */
-    @NotNull(message = "变动日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "变动日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date changeDate;
 
     /**
      * 供货厂家
      */
-    @NotBlank(message = "供货厂家不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "供货厂家不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplier;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentTagBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -42,7 +42,7 @@ public class TblEquipmentTagBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblGatewayBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -56,61 +56,61 @@ public class TblGatewayBo extends BaseEntity {
     /**
      * 远程控制
      */
-    @NotBlank(message = "远程控制不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "远程控制不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remoteManage;
 
     /**
      * 流量控制
      */
-    @NotNull(message = "流量控制不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "流量控制不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long flowControl;
 
     /**
      * 流量控制类型
      */
-    @NotBlank(message = "流量控制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "流量控制类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String flowControlType;
 
     /**
      * 所属服务
      */
-    @NotBlank(message = "所属服务不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "所属服务不能为空", groups = { AddGroup.class, EditGroup.class })
     private String belongService;
 
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String remark;
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

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

@@ -24,111 +24,111 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblModbusRtuBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolName;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolDesc;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolType;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String apiUrl;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String commPortId;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long commPortType;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long baudRate;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dateBits;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long parity;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long stopBits;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String uuid;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String interval;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblModbusTcpBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -74,37 +74,37 @@ public class TblModbusTcpBo extends BaseEntity {
     /**
      * 轮询间隔（ms）
      */
-    @NotNull(message = "轮询间隔（ms）不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "轮询间隔（ms）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long interval;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

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

@@ -0,0 +1,67 @@
+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
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblMqttInfoBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * Mqtt地址
+     */
+    @NotBlank(message = "Mqtt地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String serverAddress;
+
+    /**
+     * 账号
+     */
+    @NotBlank(message = "账号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String account;
+
+    /**
+     * 密码
+     */
+    @NotBlank(message = "密码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String password;
+
+    /**
+     * 配置唯一uuid
+     */
+    @NotBlank(message = "配置唯一uuid不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String uuid;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * mqtt状态 0：关闭，1：启用
+     */
+    @NotNull(message = "mqtt状态 0：关闭，1：启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}

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

@@ -0,0 +1,67 @@
+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_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblMqttTopicBo extends BaseEntity {
+
+    /**
+     * 主题id
+     */
+    @NotNull(message = "主题id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 主题topic
+     */
+    @NotBlank(message = "主题topic不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String topic;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 协议名称
+     */
+    @NotBlank(message = "协议名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String protocolName;
+
+    /**
+     * 协议描述
+     */
+    @NotBlank(message = "协议描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String protocolDesc;
+
+    /**
+     * 协议类型
+     */
+    @NotBlank(message = "协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String protocolType;
+
+    /**
+     * 状态 0：关闭 1：启用
+     */
+    @NotNull(message = "状态 0：关闭 1：启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}

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

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -44,25 +44,25 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 触发类型
      */
-    @NotBlank(message = "触发类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "触发类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 传感器Id
      */
-    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long sensorId;
 
     /**
      * 时间
      */
-    @NotNull(message = "时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date time;
 
     /**
@@ -74,49 +74,49 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleExecuteBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -44,67 +44,67 @@ public class TblRuleExecuteBo extends BaseEntity {
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 执行动作
      */
-    @NotBlank(message = "执行动作不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "执行动作不能为空", groups = { AddGroup.class, EditGroup.class })
     private String executeAction;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
     /**
      * 规则id
      */
-    @NotNull(message = "规则id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "规则id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ruleId;
 
     /**
      * 条件id
      */
-    @NotNull(message = "条件id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "条件id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long executeId;
 
 

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

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleFilterBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -56,55 +56,55 @@ public class TblRuleFilterBo extends BaseEntity {
     /**
      * 过滤算法
      */
-    @NotBlank(message = "过滤算法不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "过滤算法不能为空", groups = { AddGroup.class, EditGroup.class })
     private String filterAlgorithm;
 
     /**
      * 公式
      */
-    @NotBlank(message = "公式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "公式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String formula;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblSeneorBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -48,7 +48,7 @@ public class TblSeneorBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sensorDesc;
 
     /**
@@ -60,7 +60,7 @@ public class TblSeneorBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblSensorSbookBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -44,19 +44,19 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 上层位置
      */
-    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentTreeId;
 
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 设备名称
      */
-    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentName;
 
     /**
@@ -68,25 +68,25 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 协议配置
      */
-    @NotBlank(message = "协议配置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "协议配置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String configUuid;
 
     /**
      * 点表
      */
-    @NotNull(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long datapointId;
 
     /**
      * 单位
      */
-    @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unit;
 
     /**
      * 类型
      */
-    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
@@ -98,55 +98,55 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 标签
      */
-    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tagids;
 
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -26,103 +26,103 @@ public class TblVideoBo extends BaseEntity {
     /**
      * id
      */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 摄像头名称
      */
-    @NotBlank(message = "摄像头名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像头名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 平台编码
      */
-    @NotBlank(message = "平台编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "平台编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sn;
 
     /**
      * 主设备类型
      */
-    @NotBlank(message = "主设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "主设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 主设备协议类型
      */
-    @NotBlank(message = "主设备协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "主设备协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolType;
 
     /**
      * 设备互联编码
      */
-    @NotBlank(message = "设备互联编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备互联编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String connectCode;
 
     /**
      * 设备型号
      */
-    @NotNull(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long model;
 
     /**
      * 视频制式
      */
-    @NotBlank(message = "视频制式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "视频制式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String videoFormat;
 
     /**
      * 设备提供商类型
      */
-    @NotBlank(message = "设备提供商类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备提供商类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String vendorType;
 
     /**
      * 序列号
      */
-    @NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serialNumber;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

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

@@ -24,105 +24,105 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblVideoDetailBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 视频通道输入号
      */
-    @NotBlank(message = "视频通道输入号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "视频通道输入号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String videoChannel;
 
     /**
      * 摄像机编码
      */
-    @NotBlank(message = "摄像机编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraCode;
 
     /**
      * 摄像机名称
      */
-    @NotBlank(message = "摄像机名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraName;
 
     /**
      * 摄像机类型
      */
-    @NotBlank(message = "摄像机类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraType;
 
     /**
      * 摄像机位置
      */
-    @NotBlank(message = "摄像机位置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraLocationDesc;
 
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String latitude;
 
     /**
      * 高度
      */
-    @NotBlank(message = "高度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "高度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String height;
 
     /**
      * 音频输出通道
      */
-    @NotBlank(message = "音频输出通道不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "音频输出通道不能为空", groups = { AddGroup.class, EditGroup.class })
     private String voiceOutCode;
 
     /**
      * 是否支持组播
      */
-    @NotBlank(message = "是否支持组播不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "是否支持组播不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isSupportBoardcast;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 主设备id
      */
-    @NotNull(message = "主设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "主设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long videoId;
 
 

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

@@ -24,105 +24,105 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblWarnBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 告警名称
      */
-    @NotBlank(message = "告警名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 告警值
      */
-    @NotNull(message = "告警值不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "告警值不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long val;
 
     /**
      * 设备id
      */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 告警设备
      */
-    @NotBlank(message = "告警设备不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警设备不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentName;
 
     /**
      * 告警内容
      */
-    @NotBlank(message = "告警内容不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 处理人
      */
-    @NotBlank(message = "处理人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handler;
 
     /**
      * 处理方式
      */
-    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handleWay;
 
     /**
      * 吃力描述
      */
-    @NotBlank(message = "吃力描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "吃力描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handleContent;
 
     /**
      * 处理时间
      */
-    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date handleTime;
 
     /**
      * 告警时间
      */
-    @NotNull(message = "告警时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "告警时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date alarmTime;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

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

@@ -0,0 +1,67 @@
+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
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblMqttInfoVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * Mqtt地址
+     */
+    @ExcelProperty(value = "Mqtt地址")
+    private String serverAddress;
+
+    /**
+     * 账号
+     */
+    @ExcelProperty(value = "账号")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @ExcelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 配置唯一uuid
+     */
+    @ExcelProperty(value = "配置唯一uuid")
+    private String uuid;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * mqtt状态 0：关闭，1：启用
+     */
+    @ExcelProperty(value = "mqtt状态 0：关闭，1：启用")
+    private Long status;
+
+
+}

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

@@ -0,0 +1,67 @@
+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_topic
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblMqttTopicVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主题id
+     */
+    @ExcelProperty(value = "主题id")
+    private Long id;
+
+    /**
+     * 主题topic
+     */
+    @ExcelProperty(value = "主题topic")
+    private String topic;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 协议名称
+     */
+    @ExcelProperty(value = "协议名称")
+    private String protocolName;
+
+    /**
+     * 协议描述
+     */
+    @ExcelProperty(value = "协议描述")
+    private String protocolDesc;
+
+    /**
+     * 协议类型
+     */
+    @ExcelProperty(value = "协议类型")
+    private String protocolType;
+
+    /**
+     * 状态 0：关闭 1：启用
+     */
+    @ExcelProperty(value = "状态 0：关闭 1：启用")
+    private Long status;
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblMqttInfo;
+import com.ruoyi.data.domain.vo.TblMqttInfoVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * mqtt连接配置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface TblMqttInfoMapper extends BaseMapperPlus<TblMqttInfoMapper, TblMqttInfo, TblMqttInfoVo> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblMqttTopic;
+import com.ruoyi.data.domain.vo.TblMqttTopicVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * mqtt主题信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface TblMqttTopicMapper extends BaseMapperPlus<TblMqttTopicMapper, TblMqttTopic, TblMqttTopicVo> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttInfoService.java

@@ -0,0 +1,49 @@
+package com.ruoyi.data.service;
+
+import com.ruoyi.data.domain.TblMqttInfo;
+import com.ruoyi.data.domain.vo.TblMqttInfoVo;
+import com.ruoyi.data.domain.bo.TblMqttInfoBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * mqtt连接配置Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface ITblMqttInfoService {
+
+    /**
+     * 查询mqtt连接配置
+     */
+    TblMqttInfoVo queryById(Long id);
+
+    /**
+     * 查询mqtt连接配置列表
+     */
+    TableDataInfo<TblMqttInfoVo> queryPageList(TblMqttInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询mqtt连接配置列表
+     */
+    List<TblMqttInfoVo> queryList(TblMqttInfoBo bo);
+
+    /**
+     * 新增mqtt连接配置
+     */
+    Boolean insertByBo(TblMqttInfoBo bo);
+
+    /**
+     * 修改mqtt连接配置
+     */
+    Boolean updateByBo(TblMqttInfoBo bo);
+
+    /**
+     * 校验并批量删除mqtt连接配置信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttService.java

@@ -46,4 +46,6 @@ public interface ITblMqttService {
      * 校验并批量删除mqtt配置信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void initMqtt();
 }

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttTopicService.java

@@ -0,0 +1,49 @@
+package com.ruoyi.data.service;
+
+import com.ruoyi.data.domain.TblMqttTopic;
+import com.ruoyi.data.domain.vo.TblMqttTopicVo;
+import com.ruoyi.data.domain.bo.TblMqttTopicBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * mqtt主题信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface ITblMqttTopicService {
+
+    /**
+     * 查询mqtt主题信息
+     */
+    TblMqttTopicVo queryById(Long id);
+
+    /**
+     * 查询mqtt主题信息列表
+     */
+    TableDataInfo<TblMqttTopicVo> queryPageList(TblMqttTopicBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询mqtt主题信息列表
+     */
+    List<TblMqttTopicVo> queryList(TblMqttTopicBo bo);
+
+    /**
+     * 新增mqtt主题信息
+     */
+    Boolean insertByBo(TblMqttTopicBo bo);
+
+    /**
+     * 修改mqtt主题信息
+     */
+    Boolean updateByBo(TblMqttTopicBo bo);
+
+    /**
+     * 校验并批量删除mqtt主题信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttInfoServiceImpl.java

@@ -0,0 +1,113 @@
+package com.ruoyi.data.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.data.domain.bo.TblMqttInfoBo;
+import com.ruoyi.data.domain.vo.TblMqttInfoVo;
+import com.ruoyi.data.domain.TblMqttInfo;
+import com.ruoyi.data.mapper.TblMqttInfoMapper;
+import com.ruoyi.data.service.ITblMqttInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * mqtt连接配置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@RequiredArgsConstructor
+@Service
+public class TblMqttInfoServiceImpl implements ITblMqttInfoService {
+
+    private final TblMqttInfoMapper baseMapper;
+
+    /**
+     * 查询mqtt连接配置
+     */
+    @Override
+    public TblMqttInfoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询mqtt连接配置列表
+     */
+    @Override
+    public TableDataInfo<TblMqttInfoVo> queryPageList(TblMqttInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblMqttInfo> lqw = buildQueryWrapper(bo);
+        Page<TblMqttInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询mqtt连接配置列表
+     */
+    @Override
+    public List<TblMqttInfoVo> queryList(TblMqttInfoBo bo) {
+        LambdaQueryWrapper<TblMqttInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblMqttInfo> buildQueryWrapper(TblMqttInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblMqttInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getServerAddress()), TblMqttInfo::getServerAddress, bo.getServerAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccount()), TblMqttInfo::getAccount, bo.getAccount());
+        lqw.eq(StringUtils.isNotBlank(bo.getPassword()), TblMqttInfo::getPassword, bo.getPassword());
+        lqw.eq(StringUtils.isNotBlank(bo.getUuid()), TblMqttInfo::getUuid, bo.getUuid());
+        lqw.eq(bo.getStatus() != null, TblMqttInfo::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增mqtt连接配置
+     */
+    @Override
+    public Boolean insertByBo(TblMqttInfoBo bo) {
+        TblMqttInfo add = BeanUtil.toBean(bo, TblMqttInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改mqtt连接配置
+     */
+    @Override
+    public Boolean updateByBo(TblMqttInfoBo bo) {
+        TblMqttInfo update = BeanUtil.toBean(bo, TblMqttInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblMqttInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除mqtt连接配置
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttServiceImpl.java

@@ -117,4 +117,10 @@ public class TblMqttServiceImpl implements ITblMqttService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public void initMqtt(){
+        TblMqttBo bo = new TblMqttBo();
+        LambdaQueryWrapper<TblMqtt> lqw = buildQueryWrapper(bo);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttTopicServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.data.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.data.domain.bo.TblMqttTopicBo;
+import com.ruoyi.data.domain.vo.TblMqttTopicVo;
+import com.ruoyi.data.domain.TblMqttTopic;
+import com.ruoyi.data.mapper.TblMqttTopicMapper;
+import com.ruoyi.data.service.ITblMqttTopicService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * mqtt主题信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@RequiredArgsConstructor
+@Service
+public class TblMqttTopicServiceImpl implements ITblMqttTopicService {
+
+    private final TblMqttTopicMapper baseMapper;
+
+    /**
+     * 查询mqtt主题信息
+     */
+    @Override
+    public TblMqttTopicVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询mqtt主题信息列表
+     */
+    @Override
+    public TableDataInfo<TblMqttTopicVo> queryPageList(TblMqttTopicBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblMqttTopic> lqw = buildQueryWrapper(bo);
+        Page<TblMqttTopicVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询mqtt主题信息列表
+     */
+    @Override
+    public List<TblMqttTopicVo> queryList(TblMqttTopicBo bo) {
+        LambdaQueryWrapper<TblMqttTopic> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblMqttTopic> buildQueryWrapper(TblMqttTopicBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblMqttTopic> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTopic()), TblMqttTopic::getTopic, bo.getTopic());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), TblMqttTopic::getName, bo.getName());
+        lqw.like(StringUtils.isNotBlank(bo.getProtocolName()), TblMqttTopic::getProtocolName, bo.getProtocolName());
+        lqw.eq(StringUtils.isNotBlank(bo.getProtocolDesc()), TblMqttTopic::getProtocolDesc, bo.getProtocolDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getProtocolType()), TblMqttTopic::getProtocolType, bo.getProtocolType());
+        lqw.eq(bo.getStatus() != null, TblMqttTopic::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增mqtt主题信息
+     */
+    @Override
+    public Boolean insertByBo(TblMqttTopicBo bo) {
+        TblMqttTopic add = BeanUtil.toBean(bo, TblMqttTopic.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改mqtt主题信息
+     */
+    @Override
+    public Boolean updateByBo(TblMqttTopicBo bo) {
+        TblMqttTopic update = BeanUtil.toBean(bo, TblMqttTopic.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblMqttTopic entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除mqtt主题信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-system/src/main/resources/mapper/data/TblMqttInfoMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.data.mapper.TblMqttInfoMapper">
+
+    <resultMap type="com.ruoyi.data.domain.TblMqttInfo" id="TblMqttInfoResult">
+        <result property="id" column="id"/>
+        <result property="serverAddress" column="server_address"/>
+        <result property="account" column="account"/>
+        <result property="password" column="password"/>
+        <result property="uuid" column="uuid"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-system/src/main/resources/mapper/data/TblMqttTopicMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.data.mapper.TblMqttTopicMapper">
+
+    <resultMap type="com.ruoyi.data.domain.TblMqttTopic" id="TblMqttTopicResult">
+        <result property="id" column="id"/>
+        <result property="topic" column="topic"/>
+        <result property="name" column="name"/>
+        <result property="protocolName" column="protocol_name"/>
+        <result property="protocolDesc" column="protocol_desc"/>
+        <result property="protocolType" column="protocol_type"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>