【功能新增】IoT: 数据桥梁 CRUD

yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java

@@ -70,4 +70,7 @@ public interface ErrorCodeConstants {
     // ========== MQTT 通信相关 1-050-009-000 ==========
     ErrorCode MQTT_TOPIC_ILLEGAL = new ErrorCode(1_050_009_000, "topic illegal");
 
+    // ========== IoT 数据桥梁 1-050-010-000 ==========
+    ErrorCode DATA_BRIDGE_NOT_EXISTS = new ErrorCode(1_050_010_000, "IoT 数据桥梁不存在");
+
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.iot.controller.admin.rule;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgePageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgeRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgeSaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import cn.iocoder.yudao.module.iot.service.rule.IotDataBridgeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - IoT 数据桥梁")
+@RestController
+@RequestMapping("/iot/data-bridge")
+@Validated
+public class IotDataBridgeController {
+
+    @Resource
+    private IotDataBridgeService dataBridgeService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建IoT 数据桥梁")
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:create')")
+    public CommonResult<Long> createDataBridge(@Valid @RequestBody IotDataBridgeSaveReqVO createReqVO) {
+        return success(dataBridgeService.createDataBridge(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新IoT 数据桥梁")
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:update')")
+    public CommonResult<Boolean> updateDataBridge(@Valid @RequestBody IotDataBridgeSaveReqVO updateReqVO) {
+        dataBridgeService.updateDataBridge(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除IoT 数据桥梁")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:delete')")
+    public CommonResult<Boolean> deleteDataBridge(@RequestParam("id") Long id) {
+        dataBridgeService.deleteDataBridge(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得IoT 数据桥梁")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:query')")
+    public CommonResult<IotDataBridgeRespVO> getDataBridge(@RequestParam("id") Long id) {
+        IotDataBridgeDO dataBridge = dataBridgeService.getDataBridge(id);
+        return success(BeanUtils.toBean(dataBridge, IotDataBridgeRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得IoT 数据桥梁分页")
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:query')")
+    public CommonResult<PageResult<IotDataBridgeRespVO>> getDataBridgePage(@Valid IotDataBridgePageReqVO pageReqVO) {
+        PageResult<IotDataBridgeDO> pageResult = dataBridgeService.getDataBridgePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDataBridgeRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出IoT 数据桥梁 Excel")
+    @PreAuthorize("@ss.hasPermission('iot:data-bridge:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportDataBridgeExcel(@Valid IotDataBridgePageReqVO pageReqVO,
+                                      HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDataBridgeDO> list = dataBridgeService.getDataBridgePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "IoT 数据桥梁.xls", "数据", IotDataBridgeRespVO.class,
+                BeanUtils.toBean(list, IotDataBridgeRespVO.class));
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgePageReqVO.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - IoT 数据桥梁分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDataBridgePageReqVO extends PageParam {
+
+    @Schema(description = "桥梁名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "桥梁描述", example = "随便")
+    private String description;
+
+    @Schema(description = "桥梁状态", example = "2")
+    private Integer status;
+
+    @Schema(description = "桥梁方向")
+    private Integer direction;
+
+    @Schema(description = "桥梁类型", example = "1")
+    private Integer type;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgeRespVO.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - IoT 数据桥梁 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDataBridgeRespVO {
+
+    @Schema(description = "桥梁编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18564")
+    @ExcelProperty("桥梁编号")
+    private Long id;
+
+    @Schema(description = "桥梁名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("桥梁名称")
+    private String name;
+
+    @Schema(description = "桥梁描述", example = "随便")
+    @ExcelProperty("桥梁描述")
+    private String description;
+
+    @Schema(description = "桥梁状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "桥梁状态", converter = DictConvert.class)
+    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer status;
+
+    @Schema(description = "桥梁方向", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty(value = "桥梁方向", converter = DictConvert.class)
+    @DictFormat("iot_data_bridg_direction_enum") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer direction;
+
+    @Schema(description = "桥梁类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty(value = "桥梁类型", converter = DictConvert.class)
+    @DictFormat("iot_data_bridg_type_enum") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer type;
+
+    @Schema(description = "桥梁配置")
+    @ExcelProperty("桥梁配置")
+    private String config;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgeSaveReqVO.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "管理后台 - IoT 数据桥梁新增/修改 Request VO")
+@Data
+public class IotDataBridgeSaveReqVO {
+
+    @Schema(description = "桥梁编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18564")
+    private Long id;
+
+    @Schema(description = "桥梁名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "桥梁名称不能为空")
+    private String name;
+
+    @Schema(description = "桥梁描述", example = "随便")
+    private String description;
+
+    @Schema(description = "桥梁状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "桥梁状态不能为空")
+    private Integer status;
+
+    @Schema(description = "桥梁方向", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "桥梁方向不能为空")
+    private Integer direction;
+
+    @Schema(description = "桥梁类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "桥梁类型不能为空")
+    private Integer type;
+
+    @Schema(description = "桥梁配置")
+    private String config;
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.yudao.module.iot.controller.admin.rule.vo;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/rule/IotDataBridgeMapper.java

@@ -1,9 +1,29 @@
 package cn.iocoder.yudao.module.iot.dal.mysql.rule;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgePageReqVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * IoT 数据桥梁 Mapper
+ *
+ * @author HUIHUI
+ */
 @Mapper
 public interface IotDataBridgeMapper extends BaseMapperX<IotDataBridgeDO> {
-}
+
+    default PageResult<IotDataBridgeDO> selectPage(IotDataBridgePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDataBridgeDO>()
+                .likeIfPresent(IotDataBridgeDO::getName, reqVO.getName())
+                .likeIfPresent(IotDataBridgeDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(IotDataBridgeDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotDataBridgeDO::getDirection, reqVO.getDirection())
+                .eqIfPresent(IotDataBridgeDO::getType, reqVO.getType())
+                .betweenIfPresent(IotDataBridgeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDataBridgeDO::getId));
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeService.java

@@ -1,20 +1,54 @@
 package cn.iocoder.yudao.module.iot.service.rule;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgePageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgeSaveReqVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import jakarta.validation.Valid;
 
 /**
- * IoT 数据桥梁的 Service 接口
+ * IoT 数据桥梁 Service 接口
  *
- * @author 芋道源码
+ * @author HUIHUI
  */
 public interface IotDataBridgeService {
 
     /**
-     * 获得指定数据桥梁
+     * 创建IoT 数据桥梁
      *
-     * @param id 数据桥梁编号
-     * @return 数据桥梁
+     * @param createReqVO 创建信息
+     * @return 编号
      */
-    IotDataBridgeDO getIotDataBridge(Long id);
+    Long createDataBridge(@Valid IotDataBridgeSaveReqVO createReqVO);
 
-}
+    /**
+     * 更新IoT 数据桥梁
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateDataBridge(@Valid IotDataBridgeSaveReqVO updateReqVO);
+
+    /**
+     * 删除IoT 数据桥梁
+     *
+     * @param id 编号
+     */
+    void deleteDataBridge(Long id);
+
+    /**
+     * 获得IoT 数据桥梁
+     *
+     * @param id 编号
+     * @return IoT 数据桥梁
+     */
+    IotDataBridgeDO getDataBridge(Long id);
+
+    /**
+     * 获得IoT 数据桥梁分页
+     *
+     * @param pageReqVO 分页查询
+     * @return IoT 数据桥梁分页
+     */
+    PageResult<IotDataBridgeDO> getDataBridgePage(IotDataBridgePageReqVO pageReqVO);
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java

@@ -1,45 +1,70 @@
 package cn.iocoder.yudao.module.iot.service.rule;
 
-import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgePageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.rule.vo.databridge.IotDataBridgeSaveReqVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
 import cn.iocoder.yudao.module.iot.dal.mysql.rule.IotDataBridgeMapper;
-import cn.iocoder.yudao.module.iot.enums.rule.IotDataBridgTypeEnum;
 import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.Objects;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DATA_BRIDGE_NOT_EXISTS;
 
 /**
- * IoT 数据桥梁的 Service 实现类
+ * IoT 数据桥梁 Service 实现类
  *
- * @author 芋道源码
+ * @author HUIHUI
  */
 @Service
 @Validated
-@Slf4j
 public class IotDataBridgeServiceImpl implements IotDataBridgeService {
 
     @Resource
     private IotDataBridgeMapper dataBridgeMapper;
 
-    // TODO @芋艿：临时测试
     @Override
-    public IotDataBridgeDO getIotDataBridge(Long id) {
-        if (Objects.equals(id, 1L)) {
-            IotDataBridgeDO.HttpConfig config = new IotDataBridgeDO.HttpConfig()
-                    .setUrl("http://127.0.0.1:48080/test")
-//                    .setMethod("POST")
-                    .setMethod("GET")
-                    .setQuery(MapUtil.of("aaa", "bbb"))
-                    .setHeaders(MapUtil.of("ccc", "ddd"))
-                    .setBody(JsonUtils.toJsonString(MapUtil.of("eee", "fff")));
-            return IotDataBridgeDO.builder().id(1L).name("芋道").description("芋道源码").status(0).direction(1)
-                    .type(IotDataBridgTypeEnum.HTTP.getType()).config(config).build();
+    public Long createDataBridge(IotDataBridgeSaveReqVO createReqVO) {
+        // 插入
+        IotDataBridgeDO dataBridge = BeanUtils.toBean(createReqVO, IotDataBridgeDO.class);
+        dataBridgeMapper.insert(dataBridge);
+        // 返回
+        return dataBridge.getId();
+    }
+
+    @Override
+    public void updateDataBridge(IotDataBridgeSaveReqVO updateReqVO) {
+        // 校验存在
+        validateDataBridgeExists(updateReqVO.getId());
+        // 更新
+        IotDataBridgeDO updateObj = BeanUtils.toBean(updateReqVO, IotDataBridgeDO.class);
+        dataBridgeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteDataBridge(Long id) {
+        // 校验存在
+        validateDataBridgeExists(id);
+        // 删除
+        dataBridgeMapper.deleteById(id);
+    }
+
+    private void validateDataBridgeExists(Long id) {
+        if (dataBridgeMapper.selectById(id) == null) {
+            throw exception(DATA_BRIDGE_NOT_EXISTS);
         }
+    }
+
+    @Override
+    public IotDataBridgeDO getDataBridge(Long id) {
         return dataBridgeMapper.selectById(id);
     }
 
-}
+    @Override
+    public PageResult<IotDataBridgeDO> getDataBridgePage(IotDataBridgePageReqVO pageReqVO) {
+        return dataBridgeMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java

@@ -36,7 +36,7 @@ public class IotRuleSceneDataBridgeAction implements IotRuleSceneAction {
         }
         // 1.2 获得数据桥梁
         Assert.notNull(config.getDataBridgeId(), "数据桥梁编号不能为空");
-        IotDataBridgeDO dataBridge = dataBridgeService.getIotDataBridge(config.getDataBridgeId());
+        IotDataBridgeDO dataBridge = dataBridgeService.getDataBridge(config.getDataBridgeId());
         if (dataBridge == null || dataBridge.getConfig() == null) {
             log.error("[execute][message({}) config({}) 对应的数据桥梁不存在]", message, config);
             return;