liwei19941102 2 лет назад
Родитель
Сommit
3df5814961
18 измененных файлов с 1001 добавлено и 0 удалено
  1. 108 0
      ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttInfoController.java
  2. 108 0
      ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttTopicController.java
  3. 55 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqttInfo.java
  4. 55 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqttTopic.java
  5. 67 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblMqttInfoBo.java
  6. 67 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblMqttTopicBo.java
  7. 67 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttInfoVo.java
  8. 67 0
      ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttTopicVo.java
  9. 15 0
      ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttInfoMapper.java
  10. 15 0
      ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttTopicMapper.java
  11. 49 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttInfoService.java
  12. 2 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttService.java
  13. 49 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttTopicService.java
  14. 113 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttInfoServiceImpl.java
  15. 6 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttServiceImpl.java
  16. 114 0
      ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttTopicServiceImpl.java
  17. 22 0
      ruoyi-system/src/main/resources/mapper/data/TblMqttInfoMapper.xml
  18. 22 0
      ruoyi-system/src/main/resources/mapper/data/TblMqttTopicMapper.xml

+ 108 - 0
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));
+    }
+}

+ 108 - 0
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));
+    }
+}

+ 55 - 0
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;
+
+}

+ 55 - 0
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;
+
+}

+ 67 - 0
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;
+
+
+}

+ 67 - 0
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;
+
+
+}

+ 67 - 0
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;
+
+
+}

+ 67 - 0
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;
+
+
+}

+ 15 - 0
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> {
+
+}

+ 15 - 0
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> {
+
+}

+ 49 - 0
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);
+}

+ 2 - 0
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();
 }

+ 49 - 0
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);
+}

+ 113 - 0
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;
+    }
+}

+ 6 - 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);
+    }
 }

+ 114 - 0
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;
+    }
+}

+ 22 - 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>

+ 22 - 0
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>